From d930edb3f04addbaa27949ad9030fcc9ff1bd1fd Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 17 Dec 2010 13:08:16 -0800 Subject: [PATCH] digestcheck: avoid display of u'' from KeyError In python-2.x, KeyError.__str__ produces unicode literals that we don't want users to see. --- pym/portage/package/ebuild/digestcheck.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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), -- 2.26.2