For bug #165783, handle an InvalidDependString exception triggered by an invalid...

svn path=/main/branches/2.1.2/; revision=5909

diff --git a/bin/emerge b/bin/emerge
index af9362abe836063ca971cde0ae8c822c1cd7163b..a23a36bee9014b85d95bf6fefad5ab876aa29e1b 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2485,9 +2485,15 @@ class depgraph:
                                        # size verbose
                                        mysize=0
                                        if x[0] == "ebuild" and x[-1]!="nomerge":
-                                               myfilesdict = portdb.getfetchsizes(
-                                                       pkg_key, useflags=self.useFlags[myroot][pkg_key],
-                                                       debug=self.edebug)
+                                               try:
+                                                       myfilesdict = portdb.getfetchsizes(pkg_key,
+                                                               useflags=self.useFlags[myroot][pkg_key],
+                                                               debug=self.edebug)
+                                               except portage_exception.InvalidDependString, e:
+                                                       src_uri = portdb.aux_get(pkg_key, ["SRC_URI"])[0]
+                                                       show_invalid_depstring_notice(x, src_uri, str(e))
+                                                       del e
+                                                       sys.exit(1)
                                                if myfilesdict is None:
                                                        myfilesdict="[empty/missing/bad digest]"
                                                else: