summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-09-25 05:03:13 +0000
committerZac Medico <zmedico@gentoo.org>2009-09-25 05:03:13 +0000
commit035c81c554c135ff5a22e6ac8e21c33e8facaf0d (patch)
treed4c919e99d563f37efc7f52299242602feaee4ad
parent940779ee1638db9b823e669b5070169e264538bf (diff)
downloadportage-035c81c554c135ff5a22e6ac8e21c33e8facaf0d.tar.gz
portage-035c81c554c135ff5a22e6ac8e21c33e8facaf0d.tar.bz2
portage-035c81c554c135ff5a22e6ac8e21c33e8facaf0d.zip
Fix ValueError in digestcheck(), reported by Arfrever.
svn path=/main/trunk/; revision=14419
-rw-r--r--pym/portage/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 9adab4baf..5fb492ae9 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -5419,6 +5419,7 @@ def digestcheck(myfiles, mysettings, strict=0, justmanifest=0):
return 0
continue
for d in dirs:
+ d_bytes = d
try:
d = _unicode_decode(d,
encoding=_encodings['fs'], errors='strict')
@@ -5434,7 +5435,7 @@ def digestcheck(myfiles, mysettings, strict=0, justmanifest=0):
dirs.remove(d)
continue
if d.startswith(".") or d == "CVS":
- dirs.remove(d)
+ dirs.remove(d_bytes)
for f in files:
try:
f = _unicode_decode(f,