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

move todelete above disabled check, add comment

Browse source
This commit is contained in:
Ethan Erchinger 2015-10-28 20:34:37 +00:00
parent 64feec413f
commit f1d570ff18
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/yumpkg.py
View file

@ -1857,6 +1857,9 @@ def mod_repo(repo, basedir=None, **kwargs):
'Only one of \'mirrorlist\' and \'baseurl\' can be specified'
)
todelete = []
# 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':
@ -1865,7 +1868,6 @@ def mod_repo(repo, basedir=None, **kwargs):
todelete.append('disabled')
# Build a list of keys to be deleted
todelete = []
for key in repo_opts:
if repo_opts[key] != 0 and not repo_opts[key]:
del repo_opts[key]