Handle potential InvalidDependString exceptions from visible().

svn path=/main/trunk/; revision=9912

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index ab1bb3543a7fdddc45db785d67c6d238a43c9c24..f7155faffc8c721aac8800d9c7d21c7336015c87 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -2728,7 +2728,10 @@ class depgraph(object):
                                                # here, packages that have been masked since they
                                                # were installed can be automatically downgraded
                                                # to an unmasked version.
-                                               if not visible(pkgsettings, pkg):
+                                               try:
+                                                       if not visible(pkgsettings, pkg):
+                                                               continue
+                                               except portage.exception.InvalidDependString:
                                                        continue
                                        if not built and not calculated_use:
                                                # This is avoided whenever possible because
@@ -4435,9 +4438,13 @@ class depgraph(object):
                                        arg = None
                                if arg:
                                        return False
-                       if pkg.installed and \
-                               not visible(self._depgraph.pkgsettings[pkg.root], pkg):
-                               return False
+                               if pkg.installed:
+                                       try:
+                                               if not visible(
+                                                       self._depgraph.pkgsettings[pkg.root], pkg):
+                                                       return False
+                                       except portage.exception.InvalidDependString:
+                                               pass
                        return True
 
                def _dep_expand(self, atom):