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
28 lines
719 B
Diff
28 lines
719 B
Diff
From e91e2db15b99ef677cb112bb817275ed60a1f0e1 Mon Sep 17 00:00:00 2001
|
|
From: Mihai Dinca <mdinca@suse.de>
|
|
Date: Wed, 7 Mar 2018 13:11:16 +0100
|
|
Subject: [PATCH] Fix cp.push empty file
|
|
|
|
Co-authored-by: Jochen Breuer <jbreuer@suse.de>
|
|
---
|
|
salt/master.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/salt/master.py b/salt/master.py
|
|
index fb704909c8..6fb37ece1a 100644
|
|
--- a/salt/master.py
|
|
+++ b/salt/master.py
|
|
@@ -1451,7 +1451,7 @@ class AESFuncs(object):
|
|
if load['loc']:
|
|
fp_.seek(load['loc'])
|
|
|
|
- fp_.write(load['data'])
|
|
+ fp_.write(salt.utils.stringutils.to_bytes(load['data']))
|
|
return True
|
|
|
|
def _pillar(self, load):
|
|
--
|
|
2.16.2
|
|
|
|
|