aeed45986b
- Update to 2018.3.0
- Modified:
* explore-module.run-response-to-catch-the-result-in-d.patch
* add-saltssh-multi-version-support-across-python-inte.patch
* run-salt-api-as-user-salt-bsc-1064520.patch
* fix-openscap-push.patch
* fix-decrease-loglevel-when-unable-to-resolve-addr.patch
* fix-cp.push-empty-file.patch
* make-it-possible-to-use-login-pull-and-push-from-mod.patch
* avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
* feat-add-grain-for-all-fqdns.patch
* fix-bsc-1065792.patch
* run-salt-master-as-dedicated-salt-user.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
- Add python-2.6 support to salt-ssh
- Modified:
* add-saltssh-multi-version-support-across-python-inte.patch
- Update salt-ssh multiversion patch
- Modified:
* add-saltssh-multi-version-support-across-python-inte.patch
- Removed:
* require-same-major-version-while-minor-is-allowed-to.patch
OBS-URL: https://build.opensuse.org/request/show/594031
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=117
47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
From dc262b912c63ed0d3152a01c9eaaa3ec3f8e0f7e Mon Sep 17 00:00:00 2001
|
|
From: Mihai Dinca <mdinca@suse.de>
|
|
Date: Tue, 13 Feb 2018 16:11:20 +0100
|
|
Subject: [PATCH] Remove obsolete unicode handling in pkg.info_installed
|
|
|
|
---
|
|
salt/modules/zypper.py | 15 +++++----------
|
|
1 file changed, 5 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py
|
|
index 51d01c3fc9..16fc877684 100644
|
|
--- a/salt/modules/zypper.py
|
|
+++ b/salt/modules/zypper.py
|
|
@@ -309,7 +309,11 @@ class _Zypper(object):
|
|
if self.error_msg and not self.__no_raise and not self.__ignore_repo_failure:
|
|
raise CommandExecutionError('Zypper command failure: {0}'.format(self.error_msg))
|
|
|
|
- return self._is_xml_mode() and dom.parseString(self.__call_result['stdout']) or self.__call_result['stdout']
|
|
+ return (
|
|
+ self._is_xml_mode() and
|
|
+ dom.parseString(salt.utils.stringutils.to_str(self.__call_result['stdout'])) or
|
|
+ self.__call_result['stdout']
|
|
+ )
|
|
|
|
|
|
__zypper__ = _Zypper()
|
|
@@ -482,15 +486,6 @@ def info_installed(*names, **kwargs):
|
|
t_nfo = dict()
|
|
# Translate dpkg-specific keys to a common structure
|
|
for key, value in six.iteritems(pkg_nfo):
|
|
- if isinstance(value, six.string_types):
|
|
- # Check, if string is encoded in a proper UTF-8
|
|
- if six.PY3:
|
|
- value_ = value.encode('UTF-8', 'ignore').decode('UTF-8', 'ignore')
|
|
- else:
|
|
- value_ = value.decode('UTF-8', 'ignore').encode('UTF-8', 'ignore')
|
|
- if value != value_:
|
|
- value = kwargs.get('errors', 'ignore') == 'ignore' and value_ or 'N/A (invalid UTF-8)'
|
|
- log.error('Package %s has bad UTF-8 code in %s: %s', pkg_name, key, value)
|
|
if key == 'source_rpm':
|
|
t_nfo['source'] = value
|
|
else:
|
|
--
|
|
2.16.2
|
|
|
|
|