From 956c7636a7cd83de6afb80b1cd9f0621419497c5 Mon Sep 17 00:00:00 2001 From: "C. R. Oldham" Date: Wed, 21 Sep 2016 20:05:33 -0600 Subject: [PATCH 12/17] Fix pkg.upgrade for zypper --- salt/modules/zypper.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py index b2a4e0b..49ce5ec 100644 --- a/salt/modules/zypper.py +++ b/salt/modules/zypper.py @@ -1146,7 +1146,7 @@ def upgrade(refresh=True, if dryrun: # Creates a solver test case for debugging. log.info('Executing debugsolver and performing a dry-run dist-upgrade') - __zypper__.noraise.call(*cmd_update + ['--debug-solver']) + __zypper__(systemd_scope=_systemd_scope()).noraise.call(*cmd_update + ['--debug-solver']) if fromrepo: for repo in fromrepo: @@ -1167,6 +1167,7 @@ def upgrade(refresh=True, old = list_pkgs() __zypper__(systemd_scope=_systemd_scope()).noraise.call(*cmd_update) + if __zypper__.exit_code not in __zypper__.SUCCESS_EXIT_CODES: ret['result'] = False else: -- 2.10.1