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

re-arrange things a bit to have less overall changes

Browse source
This commit is contained in:
Ethan Erchinger 2015-10-28 20:38:10 +00:00
parent f1d570ff18
commit 8187a4ce20
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/modules/yumpkg.py
View file

@ -1857,7 +1857,12 @@ def mod_repo(repo, basedir=None, **kwargs):
'Only one of \'mirrorlist\' and \'baseurl\' can be specified'
)
# 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]
todelete.append(key)
# convert disabled=True to enabled=0 from pkgrepo state
if 'disabled' in repo_opts:
@ -1867,12 +1872,6 @@ def mod_repo(repo, basedir=None, **kwargs):
del repo_opts['disabled']
todelete.append('disabled')
# Build a list of keys to be deleted
for key in repo_opts:
if repo_opts[key] != 0 and not repo_opts[key]:
del repo_opts[key]
todelete.append(key)
# Add baseurl or mirrorlist to the 'todelete' list if the other was
# specified in the repo_opts
if 'mirrorlist' in repo_opts: