2016-09-28 09:49:13 +02:00
|
|
|
From cad9f1a8fda2a4d8c666abcf74e03e7c6a8eb6be Mon Sep 17 00:00:00 2001
|
2016-02-24 18:43:06 +01:00
|
|
|
From: Bo Maryniuk <bo@suse.de>
|
|
|
|
|
Date: Mon, 18 Jan 2016 16:28:48 +0100
|
2016-06-24 14:36:42 +02:00
|
|
|
Subject: [PATCH 03/12] Check if byte strings are properly encoded in UTF-8
|
2016-02-24 18:43:06 +01:00
|
|
|
|
|
|
|
|
Rename keywords arguments variable to a default name.
|
|
|
|
|
---
|
|
|
|
|
salt/modules/zypper.py | 11 ++++++-----
|
|
|
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py
|
2016-09-28 09:49:13 +02:00
|
|
|
index 7dd73dd..92c604e 100644
|
2016-02-24 18:43:06 +01:00
|
|
|
--- a/salt/modules/zypper.py
|
|
|
|
|
+++ b/salt/modules/zypper.py
|
2016-09-28 09:49:13 +02:00
|
|
|
@@ -335,9 +335,9 @@ def info_installed(*names, **kwargs):
|
2016-02-24 18:43:06 +01:00
|
|
|
summary, description.
|
|
|
|
|
|
|
|
|
|
:param errors:
|
|
|
|
|
- Handle RPM field errors (true|false). By default, various mistakes in the textual fields are simply ignored and
|
|
|
|
|
- omitted from the data. Otherwise a field with a mistake is not returned, instead a 'N/A (bad UTF-8)'
|
|
|
|
|
- (not available, broken) text is returned.
|
|
|
|
|
+ Handle RPM field errors. If 'ignore' is chosen, then various mistakes are simply ignored and omitted
|
|
|
|
|
+ from the texts or strings. If 'report' is chonen, then a field with a mistake is not returned, instead
|
|
|
|
|
+ a 'N/A (broken)' (not available, broken) text is placed.
|
|
|
|
|
|
|
|
|
|
Valid attributes are:
|
|
|
|
|
ignore, report
|
2016-09-28 09:49:13 +02:00
|
|
|
@@ -350,7 +350,8 @@ def info_installed(*names, **kwargs):
|
2016-02-24 18:43:06 +01:00
|
|
|
salt '*' pkg.info_installed <package1> <package2> <package3> ...
|
|
|
|
|
salt '*' pkg.info_installed <package1> attr=version,vendor
|
|
|
|
|
salt '*' pkg.info_installed <package1> <package2> <package3> ... attr=version,vendor
|
|
|
|
|
- salt '*' pkg.info_installed <package1> <package2> <package3> ... attr=version,vendor errors=true
|
|
|
|
|
+ salt '*' pkg.info_installed <package1> <package2> <package3> ... attr=version,vendor errors=ignore
|
|
|
|
|
+ salt '*' pkg.info_installed <package1> <package2> <package3> ... attr=version,vendor errors=report
|
|
|
|
|
'''
|
|
|
|
|
ret = dict()
|
|
|
|
|
for pkg_name, pkg_nfo in __salt__['lowpkg.info'](*names, **kwargs).items():
|
2016-09-28 09:49:13 +02:00
|
|
|
@@ -361,7 +362,7 @@ def info_installed(*names, **kwargs):
|
2016-02-24 18:43:06 +01:00
|
|
|
# Check, if string is encoded in a proper UTF-8
|
|
|
|
|
value_ = value.decode('UTF-8', 'ignore').encode('UTF-8', 'ignore')
|
|
|
|
|
if value != value_:
|
|
|
|
|
- value = kwargs.get('errors') and value_ or 'N/A (invalid UTF-8)'
|
|
|
|
|
+ value = kwargs.get('errors', 'ignore') == 'ignore' and value_ or 'N/A (invalid UTF-8)'
|
|
|
|
|
log.error('Package {0} has bad UTF-8 code in {1}: {2}'.format(pkg_name, key, value))
|
|
|
|
|
if key == 'source_rpm':
|
|
|
|
|
t_nfo['source'] = value
|
|
|
|
|
--
|
2016-09-28 09:49:13 +02:00
|
|
|
2.9.2
|
2016-02-24 18:43:06 +01:00
|
|
|
|
