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

Reverse if conditions and rename variable

Browse source
This commit is contained in:
Mihai Dinca 2016-05-30 10:48:27 +02:00
parent 80bfbe5c52
commit ced75e8e62
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
salt/modules/zypper.py
View file

@ -765,9 +765,9 @@ def mod_repo(repo, **kwargs):
added = True
# Modify added or existing repo according to the options
trigger_refresh = False
cmd_opt = []
global_cmd_opt = []
call_refresh = False
if 'enabled' in kwargs:
cmd_opt.append(kwargs['enabled'] and '--enable' or '--disable')
@ -789,23 +789,22 @@ def mod_repo(repo, **kwargs):
if kwargs.get('gpgautoimport') is True:
global_cmd_opt.append('--gpg-auto-import-keys')
trigger_refresh = True
call_refresh = True
if cmd_opt:
cmd_opt = global_cmd_opt + ['mr'] + cmd_opt + [repo]
__zypper__.refreshable.xml.call(*cmd_opt)
# If repo nor added neither modified, error should be thrown
if not added and not cmd_opt and not trigger_refresh:
raise CommandExecutionError(
'Specified arguments did not result in modification of repo'
)
elif trigger_refresh:
if call_refresh:
# when used with "zypper ar --refresh" or "zypper mr --refresh"
# --gpg-auto-import-keys is not doing anything
# so we need to specifically refresh here with --gpg-auto-import-keys
refresh_opts = global_cmd_opt + ['refresh'] + [repo]
__zypper__.xml.call(*refresh_opts)
elif not added and not cmd_opt:
raise CommandExecutionError(
'Specified arguments did not result in modification of repo'
)
return get_repo(repo)