Bug #236714 - Handle PortagePackageException raised from Manifest.create().

(trunk r11926)

svn path=/main/branches/2.1.6/; revision=11927

diff --git a/bin/ebuild b/bin/ebuild
index b4ec8701482b41f540e18362dbbe12d12d35fa22..a38d189a970c75d42b8138e6cc1ae2503e4cb632 100755 (executable)
--- 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 37b91aa255343b3190a908349607872f153b49eb..eeecab11f9754858f6b70f428061e375f4c6cb50 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4250,6 +4250,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: