Fix ValueError in digestcheck(), reported by Arfrever.
authorZac Medico <zmedico@gentoo.org>
Fri, 25 Sep 2009 05:03:13 +0000 (05:03 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 25 Sep 2009 05:03:13 +0000 (05:03 -0000)
svn path=/main/trunk/; revision=14419

pym/portage/__init__.py

index 9adab4bafdb82ba55e5fdc997a36b68c6d240900..5fb492ae981cd59c973a87b651bac1f0b07231bb 100644 (file)
@@ -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,