diff options
| author |   Mike Hiretsky <mh@calculate.ru> | 2015-04-10 10:10:27 -0700 |
|---|---|---|
| committer |   Zac Medico <zmedico@gentoo.org> | 2015-04-11 08:59:29 -0700 |
| commit | 43e23d69fe2eab78295807afc159715bef74fa19 (patch) | |
| tree | feac263bdff69ddf695c216eb8db32294229d81f | |
| parent | repoman: handle removed packages in vcs_files_to_cps (bug 546010) (diff) | |
| download | portage-43e23d69fe2eab78295807afc159715bef74fa19.tar.gz portage-43e23d69fe2eab78295807afc159715bef74fa19.tar.bz2 portage-43e23d69fe2eab78295807afc159715bef74fa19.zip | |
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@gentoo.org>
Acked-by: Alexander Berntsen <bernalex@gentoo.org>
| -rw-r--r-- | pym/portage/util/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py index aeb951e26..4b82e714a 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 |