commit: 43e23d69fe2eab78295807afc159715bef74fa19
Author: Mike Hiretsky <mh <AT> calculate <DOT> ru>
AuthorDate: Fri Apr 10 17:10:27 2015 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 15:59:29 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=43e23d69
new_protect_filename: fix _unicode_decode TypeError with symlink (bug 546176)
Since commit 02417188225758b1822d176abd8902a92300a371, new_protect_filename
has had a faulty _unicode_decode call that triggers a TypeError when
handling symlinks.
Fixes: 024171882257 ("CONFIG_PROTECT: protect symlinks, bug #485598")
X-Gentoo-Bug: 546176
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=546176
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
Acked-by: Alexander Berntsen <bernalex <AT> gentoo.org>
pym/portage/util/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index aeb951e..4b82e71 100644
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -1705,7 +1705,7 @@ def new_protect_filename(mydest, newmd5=None,
force=False):
if e.errno != errno.ENOENT:
raise
else:
- pfile_link = _unicode_decode(
+ pfile_link = _unicode_decode(pfile_link,
encoding=_encodings['merge'],
errors='replace')
if pfile_link == newmd5:
return old_pfile
