| 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: 525376 |
| 9 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=525376 |
| 10 |
Signed-off-by: Zac Medico <zmedico@g.o> |
| 11 |
--- |
| 12 |
pym/portage/util/__init__.py | 2 +- |
| 13 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py |
| 16 |
index aeb951e..4b82e71 100644 |
| 17 |
--- a/pym/portage/util/__init__.py |
| 18 |
+++ b/pym/portage/util/__init__.py |
| 19 |
@@ -1705,7 +1705,7 @@ def new_protect_filename(mydest, newmd5=None, force=False): |
| 20 |
if e.errno != errno.ENOENT: |
| 21 |
raise |
| 22 |
else: |
| 23 |
- pfile_link = _unicode_decode( |
| 24 |
+ pfile_link = _unicode_decode(pfile_link, |
| 25 |
encoding=_encodings['merge'], errors='replace') |
| 26 |
if pfile_link == newmd5: |
| 27 |
return old_pfile |
| 28 |
-- |
| 29 |
2.3.1 |
Archives