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 #36495 from cro/zypper_fix

Browse source 
Fix pkg.upgrade for zypper
This commit is contained in:
Mike Place 2016-09-26 19:02:39 +09:00 • committed by GitHub
commit d0dd92b037
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/modules/zypper.py
View file

@ -1120,10 +1120,11 @@ def upgrade(refresh=True, skip_verify=False):
refresh_db()
old = list_pkgs()
to_append = ''
if skip_verify:
to_append = '--no-gpg-checks'
__zypper__(systemd_scope=_systemd_scope()).noraise.call('update', '--auto-agree-with-licenses', to_append)
__zypper__(systemd_scope=_systemd_scope()).noraise.call('update', '--auto-agree-with-licenses', '--no-gpg-checks')
else:
__zypper__(systemd_scope=_systemd_scope()).noraise.call('update', '--auto-agree-with-licenses')
if __zypper__.exit_code not in __zypper__.SUCCESS_EXIT_CODES:
ret['result'] = False
ret['comment'] = (__zypper__.stdout() + os.linesep + __zypper__.stderr()).strip()