bbe3fe8f72
- Update patches
- Modified:
* run-salt-master-as-dedicated-salt-user.patch
* run-salt-api-as-user-salt-bsc-1064520.patch
* fix-openscap-push.patch
* fix-cp.push-empty-file.patch
* avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
* feat-add-grain-for-all-fqdns.patch
* fix-bsc-1065792.patch
* move-log_file-option-to-changeable-defaults.patch
* activate-all-beacons-sources-config-pillar-grains.patch
* remove-obsolete-unicode-handling-in-pkg.info_install.patch
- Removed:
* salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
-------------------------------------------------------------------
- Update cp.push patch
- Modified:
* fix-cp.push-empty-file.patch
* salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
- force re-generate a new thin.tgz when an update gets installed
- fix salt-ssh with a different patch
- remove: dumps-should-return-unicode-also-with-py2-to-prevent.patch
- added: salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
- Added:
OBS-URL: https://build.opensuse.org/request/show/586784
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=115
36 lines
978 B
Diff
36 lines
978 B
Diff
From 7259333c3652d5208258632532a9151648c9cb4d Mon Sep 17 00:00:00 2001
|
|
From: Mihai Dinca <mdinca@suse.de>
|
|
Date: Fri, 2 Mar 2018 17:17:58 +0100
|
|
Subject: [PATCH] Fix openscap push
|
|
|
|
---
|
|
salt/modules/openscap.py | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
diff --git a/salt/modules/openscap.py b/salt/modules/openscap.py
|
|
index c5b51a1846..e3190e1e11 100644
|
|
--- a/salt/modules/openscap.py
|
|
+++ b/salt/modules/openscap.py
|
|
@@ -13,7 +13,6 @@ from subprocess import Popen, PIPE
|
|
|
|
# Import Salt libs
|
|
from salt.ext import six
|
|
-from salt.client import Caller
|
|
|
|
|
|
ArgumentParser = object
|
|
@@ -105,8 +104,7 @@ def xccdf(params):
|
|
success = _OSCAP_EXIT_CODES_MAP[proc.returncode]
|
|
returncode = proc.returncode
|
|
if success:
|
|
- caller = Caller()
|
|
- caller.cmd('cp.push_dir', tempdir)
|
|
+ __salt__['cp.push_dir'](tempdir)
|
|
shutil.rmtree(tempdir, ignore_errors=True)
|
|
upload_dir = tempdir
|
|
|
|
--
|
|
2.16.2
|
|
|
|
|