1 |
From: Mike Hiretsky <mh@×××××××××.ru> |
2 |
|
3 |
Since commit 02417188225758b1822d176abd8902a92300a371, new_protect_filename |
4 |
has had a faulty _unicode_decode call that triggers a TypeError when |
5 |
handling symlinks. |
6 |
|
7 |
Fixes: 024171882257 ("CONFIG_PROTECT: protect symlinks, bug #485598") |
8 |
X-Gentoo-Bug: 546176 |
9 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=546176 |
10 |
Signed-off-by: Zac Medico <zmedico@g.o> |
11 |
--- |
12 |
[PATCH v2] fixes incorrect bug numbers in the commit message |
13 |
|
14 |
pym/portage/util/__init__.py | 2 +- |
15 |
1 file changed, 1 insertion(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py |
18 |
index aeb951e..4b82e71 100644 |
19 |
--- a/pym/portage/util/__init__.py |
20 |
+++ b/pym/portage/util/__init__.py |
21 |
@@ -1705,7 +1705,7 @@ def new_protect_filename(mydest, newmd5=None, force=False): |
22 |
if e.errno != errno.ENOENT: |
23 |
raise |
24 |
else: |
25 |
- pfile_link = _unicode_decode( |
26 |
+ pfile_link = _unicode_decode(pfile_link, |
27 |
encoding=_encodings['merge'], errors='replace') |
28 |
if pfile_link == newmd5: |
29 |
return old_pfile |
30 |
-- |
31 |
2.3.1 |