saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #32336 from rallytime/bp-28639

Browse source 
Back-port #28639 to 2015.8
This commit is contained in:
Mike Place 2016-04-04 14:53:11 -06:00
commit e1ef4a9d66
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/modules/yumpkg.py
View file

@ -2209,13 +2209,9 @@ def mod_repo(repo, basedir=None, **kwargs):
del repo_opts[key]
todelete.append(key)
# convert disabled=True to enabled=0 from pkgrepo state
if 'disabled' in repo_opts:
kw_disabled = repo_opts['disabled']
if kw_disabled is True or str(kw_disabled).lower() == 'true':
repo_opts['enabled'] = 0
del repo_opts['disabled']
todelete.append('disabled')
# convert disabled to enabled respectively from pkgrepo state
if 'enabled' not in repo_opts:
repo_opts['enabled'] = int(str(repo_opts.pop('disabled', False)).lower() != 'true')
# Add baseurl or mirrorlist to the 'todelete' list if the other was
# specified in the repo_opts