1592ccc37e
- fix argument handling of pkg.download
Add: 0022-fix-argument-handling-for-pkg.download.patch
- unify behavior of zypper refresh in salt
Add: 0018-unify-behavior-of-refresh.patch
0019-add-refresh-option-to-more-functions.patch
0020-simplify-checking-the-refresh-paramater.patch
0021-do-not-change-kwargs-in-refresh-while-checking-a-val.patch
- Fix crash with scheduler and runners
Add: 0017-Fix-crash-with-scheduler-and-runners-31106.patch
- Call zypper always with --non-interactive
Add:
* 0015-call-zypper-with-option-non-interactive-everywhere.patch
* 0016-write-a-zypper-command-builder-function.patch
- require rpm-python on SUSE for zypper support
- fix state return code
Add: 0009-The-functions-in-the-state-module-that-return-a-retc.patch
- add handling of OEM products to pkg.list_products
Add: 0010-add-handling-for-OEM-products.patch
- improve doc for list_pkgs
Add: 0011-improve-doc-for-list_pkgs.patch
- implement pkg.version_cmp in zypper.py
Add:
* 0012-implement-version_cmp-for-zypper.patch
* 0013-pylint-changes.patch
* 0014-Check-if-rpm-python-can-be-imported.patch
- Update to 2015.8.7
this is a small update to fix some regressions
see https://docs.saltstack.com/en/latest/topics/releases/2015.8.7.html
- Booleans should not be strings from XML, add Unix ticks time and
format result in a list of maps.
Add:
* 0008-Fix-types-in-the-output-data-and-return-just-a-list-.patch
- Stop salt-api daemon faster (bsc#963322)
Add:
* 0007-Force-kill-websocket-s-child-processes-faster-than-d.patch
- Do not crash on salt-key reject/delete consecutive calls.
Add:
* 0006-add_key-reject_key-do-not-crash-w-Permission-denied-.patch
- Update to 2015.8.5
See https://docs.saltstack.com/en/latest/topics/releases/2015.8.5.html
Dropped patches (all upstream):
* 0003-List-products-consistently-across-all-SLES-systems.patch
* 0004-Add-missing-return-data-to-scheduled-jobs.patch
* 0005-Fix-RPM-issues-with-the-date-time-and-add-package-at.patch
* 0006-Bugfix-info_available-does-not-work-correctly-on-SLE.patch
Renamed patches:
* 0007-Check-if-byte-strings-are-properly-encoded-in-UTF-8.patch
-> 0003-Check-if-byte-strings-are-properly-encoded-in-UTF-8.patch
* 0008-Fix-pkg.latest-prevent-crash-on-multiple-package-ins.patch
-> 0004-Fix-pkg.latest-prevent-crash-on-multiple-package-ins.patch
* 0009-Fix-package-status-filtering-on-latest-version-and-i.patch
-> 0005-Fix-package-status-filtering-on-latest-version-and-i.patch
- Update to 2015.8.4
See https://docs.saltstack.com/en/latest/topics/releases/2015.8.4.html
- Fix latest version available comparison and implement epoch
support in Zypper module.
Add:
* 0009-Fix-package-status-filtering-on-latest-version-and-i.patch
- Update patch from opensuse to upstream version.
Update:
* 0008-Fix-pkg.latest-prevent-crash-on-multiple-package-ins.patch
- Fix dependencies to Salt subpackages requiring release along the
version.
- Fix pkg.latest crash.
- Fix pkg.latest SLS ID bug, when pkgs empty list is passed,
but SLS ID still treated as a package name.
Add:
* 0008-Fix-pkg.latest-prevent-crash-on-multiple-package-ins.patch
- Drop:
* -0004-zypper-check-package-header-content-for-valid-utf-8.patch
- Rename:
* -0004-zypper-check-package-header-content-for-valid-utf-8.patch
+0004-Add-missing-return-data-to-scheduled-jobs.patch
* -0005-Add-missing-return-data-to-scheduled-jobs.patch
+0004-Add-missing-return-data-to-scheduled-jobs.patch
* -0006-Fix-RPM-issues-with-the-date-time-and-add-package-at.patch
+0005-Fix-RPM-issues-with-the-date-time-and-add-package-at.patch
* -0007-Bugfix-info_available-does-not-work-correctly-on-SLE.patch
+0006-Bugfix-info_available-does-not-work-correctly-on-SLE.patch
- Add:
* 0007-Check-if-byte-strings-are-properly-encoded-in-UTF-8.patch
- Rename use-forking-daemon.patch to
0001-tserong-suse.com-We-don-t-have-python-systemd-so-not.patch
- Rename use-salt-user-for-master.patch to
0002-Run-salt-master-as-dedicated-salt-user.patch
- Rename 1efe484309a5c776974e723f3da0f5181f4bdb86.patch to
0003-List-products-consistently-across-all-SLES-systems.patch
- Rename zypper-utf-8.patch to
0004-zypper-check-package-header-content-for-valid-utf-8.patch
- Rename salt-2015.8-schedule-ret.patch to
0005-Add-missing-return-data-to-scheduled-jobs.patch
- Rename salt-2015.8-pkg-zypper-attr-filtering.patch to
0006-Fix-RPM-issues-with-the-date-time-and-add-package-at.patch
- Rename salt-2015.8-zypper-info.patch to
0007-Bugfix-info_available-does-not-work-correctly-on-SLE.patch
OBS-URL: https://build.opensuse.org/request/show/361294
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/salt?expand=0&rev=55
60 lines
2.0 KiB
Diff
60 lines
2.0 KiB
Diff
From 8d77e22c0c570a0a725216f70c41d4fe00a184ca Mon Sep 17 00:00:00 2001
|
|
From: "Gareth J. Greenaway" <gareth@wiked.org>
|
|
Date: Sat, 6 Feb 2016 15:52:17 -0800
|
|
Subject: [PATCH 09/22] The functions in the state module that return a retcode
|
|
when something goes wrong, eg. a 1 or a 2, do not return a 0 when things go
|
|
the way they're supposed to go. With the recent changes to the scheduler to
|
|
ensure that the retcode is returned this is problematic and results in
|
|
exceptions when a state function is run from the schedule. This simple fix
|
|
ensures a default retcode of 0 exists, it is then override in the
|
|
_set_retcode function if there is an issue with the run
|
|
|
|
---
|
|
salt/modules/state.py | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/salt/modules/state.py b/salt/modules/state.py
|
|
index 9cb195b..27e588c 100644
|
|
--- a/salt/modules/state.py
|
|
+++ b/salt/modules/state.py
|
|
@@ -70,6 +70,10 @@ def _set_retcode(ret):
|
|
'''
|
|
Set the return code based on the data back from the state system
|
|
'''
|
|
+
|
|
+ # Set default retcode to 0
|
|
+ __context__['retcode'] = 0
|
|
+
|
|
if isinstance(ret, list):
|
|
__context__['retcode'] = 1
|
|
return
|
|
@@ -576,7 +580,6 @@ def highstate(test=None,
|
|
|
|
serial = salt.payload.Serial(__opts__)
|
|
cache_file = os.path.join(__opts__['cachedir'], 'highstate.p')
|
|
-
|
|
_set_retcode(ret)
|
|
# Work around Windows multiprocessing bug, set __opts__['test'] back to
|
|
# value from before this function was run.
|
|
@@ -770,7 +773,6 @@ def sls(mods,
|
|
except (IOError, OSError):
|
|
msg = 'Unable to write to SLS cache file {0}. Check permission.'
|
|
log.error(msg.format(cache_file))
|
|
-
|
|
_set_retcode(ret)
|
|
# Work around Windows multiprocessing bug, set __opts__['test'] back to
|
|
# value from before this function was run.
|
|
@@ -876,8 +878,7 @@ def show_highstate(queue=False, **kwargs):
|
|
ret = st_.compile_highstate()
|
|
finally:
|
|
st_.pop_active()
|
|
- if isinstance(ret, list):
|
|
- __context__['retcode'] = 1
|
|
+ _set_retcode(ret)
|
|
return ret
|
|
|
|
|
|
--
|
|
2.1.4
|
|
|