From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 17 Dec 2010 21:08:16 +0000 (-0800)
Subject: digestcheck: avoid display of u'' from KeyError
X-Git-Tag: v2.2.0_alpha10~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=66fa9c224f7d44e88344f8c7d24c8da16845eace;p=portage.git

digestcheck: avoid display of u'' from KeyError

In python-2.x, KeyError.__str__ produces unicode literals that we
don't want users to see.
---

diff --git a/pym/portage/package/ebuild/digestcheck.py b/pym/portage/package/ebuild/digestcheck.py
index c2c2beff3..68ce1f565 100644
--- a/pym/portage/package/ebuild/digestcheck.py
+++ b/pym/portage/package/ebuild/digestcheck.py
@@ -67,13 +67,12 @@ def digestcheck(myfiles, mysettings, strict=False, justmanifest=None):
 			eout.ebegin(_("checking %s ;-)") % f)
 			ftype = mf.findFile(f)
 			if ftype is None:
-				raise KeyError(f)
+				eout.eend(1)
+				writemsg(_("\n!!! Missing digest for '%s'\n") % (f,),
+					noiselevel=-1)
+				return 0
 			mf.checkFileHashes(ftype, f)
 			eout.eend(0)
-	except KeyError as e:
-		eout.eend(1)
-		writemsg(_("\n!!! Missing digest for %s\n") % str(e), noiselevel=-1)
-		return 0
 	except FileNotFound as e:
 		eout.eend(1)
 		writemsg(_("\n!!! A file listed in the Manifest could not be found: %s\n") % str(e),