From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 16 Apr 2008 00:19:13 +0000 (-0000)
Subject: Handle potential InvalidDependString exceptions from visible().
X-Git-Tag: v2.2_pre6~150
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=22ef9fa49f63d28cf239b14ec7138fe94299a012;p=portage.git

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 ab1bb3543..f7155faff 100644
--- 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):