diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/python/python-smartpm/smart-locale.patch | 27 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python-smartpm_git.bb | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-locale.patch b/meta/recipes-devtools/python/python-smartpm/smart-locale.patch new file mode 100644 index 0000000000..0f1dfb91d5 --- /dev/null +++ b/meta/recipes-devtools/python/python-smartpm/smart-locale.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | rpm or commands run by rpm can use output which isn't strictly acsii such | ||
2 | as quotation characters around expression which are character 0xe2. | ||
3 | |||
4 | Use utf-8 as an encoding rather than whatever the system suggests to | ||
5 | ensure smart copes with this rather than erroring with unicode errors. | ||
6 | |||
7 | RP 2016/5/19 | ||
8 | Upstream-Status: Pending | ||
9 | |||
10 | |||
11 | Index: git/smart/backends/rpm/pm.py | ||
12 | =================================================================== | ||
13 | --- git.orig/smart/backends/rpm/pm.py | ||
14 | +++ git/smart/backends/rpm/pm.py | ||
15 | @@ -32,11 +32,7 @@ from smart.pm import PackageManager | ||
16 | from smart import sysconf, iface, Error, _ | ||
17 | |||
18 | |||
19 | -try: | ||
20 | - ENCODING = locale.getpreferredencoding() | ||
21 | -except locale.Error: | ||
22 | - ENCODING = "ascii" | ||
23 | - | ||
24 | +ENCODING = "utf-8" | ||
25 | |||
26 | def get_public_key(header): | ||
27 | return header.sprintf("%|DSAHEADER?{%{DSAHEADER:pgpsig}}:" | ||
diff --git a/meta/recipes-devtools/python/python-smartpm_git.bb b/meta/recipes-devtools/python/python-smartpm_git.bb index f030b3eb37..5662bacf02 100644 --- a/meta/recipes-devtools/python/python-smartpm_git.bb +++ b/meta/recipes-devtools/python/python-smartpm_git.bb | |||
@@ -24,6 +24,7 @@ SRC_URI = "\ | |||
24 | file://smart-set-noprogress-for-pycurl.patch \ | 24 | file://smart-set-noprogress-for-pycurl.patch \ |
25 | file://smart-cache.py-getPackages-matches-name-version.patch \ | 25 | file://smart-cache.py-getPackages-matches-name-version.patch \ |
26 | file://smart-channel-remove-all.patch \ | 26 | file://smart-channel-remove-all.patch \ |
27 | file://smart-locale.patch \ | ||
27 | " | 28 | " |
28 | 29 | ||
29 | SRCREV = "407a7eca766431257dcd1da15175cc36a1bb22d0" | 30 | SRCREV = "407a7eca766431257dcd1da15175cc36a1bb22d0" |