summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/ebuild6
-rw-r--r--pym/portage/__init__.py3
2 files changed, 8 insertions, 1 deletions
diff --git a/bin/ebuild b/bin/ebuild
index b4ec87014..a38d189a9 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -202,7 +202,8 @@ def stale_env_warning():
for x in msg:
portage.writemsg(">>> %s\n" % x)
-from portage.exception import PermissionDenied, UnsupportedAPIException
+from portage.exception import PermissionDenied, \
+ PortagePackageException, UnsupportedAPIException
checked_for_stale_env = False
for arg in pargs:
@@ -230,6 +231,9 @@ for arg in pargs:
for x in msg:
portage.writemsg("!!! %s\n" % x, noiselevel=-1)
a = 1
+ except PortagePackageException, e:
+ portage.writemsg("!!! %s\n" % (e,), noiselevel=-1)
+ a = 1
except PermissionDenied, e:
portage.writemsg("!!! Permission Denied: %s\n" % (e,), noiselevel=-1)
a = 1
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index d9ce6db6b..d4d1f9518 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4260,6 +4260,9 @@ def digestgen(myarchives, mysettings, overwrite=1, manifestonly=0, myportdb=None
writemsg(("!!! File %s doesn't exist, can't update " + \
"Manifest\n") % e, noiselevel=-1)
return 0
+ except portage.exception.PortagePackageException, e:
+ writemsg(("!!! %s\n") % (e,), noiselevel=-1)
+ return 0
try:
mf.write(sign=False)
except portage.exception.PermissionDenied, e: