c0d7cc4bb8
- Prepend current directory when path is just filename (bsc#1095942) - Integration of MSI authentication for azurearm - Adds fix for SUSE Expanded Support os grain detection - Fixes 509x remote signing - Fix for StringIO import in Python2 - Use Adler32 algorithm to compute string checksums (bsc#1102819) - Only do reverse DNS lookup on IPs for salt-ssh (bsc#1104154) - Add support for Python 3.7 - Fix license macro to build on SLE12SP2 - Decode file contents for python2 (bsc#1102013) - Fix for sorting of multi-version packages (bsc#1097174 and bsc#1097413) - Fix mine.get not returning data - workaround for #48020 (bsc#1100142) - Added: * change-stringio-import-in-python2-to-import-the-clas.patch * integration-of-msi-authentication-with-azurearm-clou.patch * x509-fixes-for-remote-signing-106.patch * fix-for-suse-expanded-support-detection.patch * only-do-reverse-dns-lookup-on-ips-for-salt-ssh.patch * prepend-current-directory-when-path-is-just-filename.patch * add-support-for-python-3.7.patch * decode-file-contents-for-python2-bsc-1102013.patch * fix-mine.get-not-returning-data-workaround-for-48020.patch * x509-fixes-111.patch * use-adler32-algorithm-to-compute-string-checksums.patch - Modified: * fix-for-sorting-of-multi-version-packages-bsc-109717.patch OBS-URL: https://build.opensuse.org/request/show/636187 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=129
28 lines
981 B
Diff
28 lines
981 B
Diff
From 58913b6801b92bd59374cd53fa48fa74171abb73 Mon Sep 17 00:00:00 2001
|
|
From: Abid Mehmood <amehmood@suse.de>
|
|
Date: Wed, 1 Aug 2018 17:19:11 +0200
|
|
Subject: [PATCH] Decode file contents for python2(bsc#1102013)
|
|
|
|
---
|
|
salt/states/file.py | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/salt/states/file.py b/salt/states/file.py
|
|
index e1d247ae4f..db82098a33 100644
|
|
--- a/salt/states/file.py
|
|
+++ b/salt/states/file.py
|
|
@@ -1105,8 +1105,7 @@ def _get_template_texts(source_list=None,
|
|
tmplines = None
|
|
with salt.utils.files.fopen(rndrd_templ_fn, 'rb') as fp_:
|
|
tmplines = fp_.read()
|
|
- if six.PY3:
|
|
- tmplines = tmplines.decode(__salt_system_encoding__)
|
|
+ tmplines = tmplines.decode(__salt_system_encoding__)
|
|
tmplines = tmplines.splitlines(True)
|
|
if not tmplines:
|
|
msg = 'Failed to read rendered template file {0} ({1})'
|
|
--
|
|
2.17.1
|
|
|
|
|