[gentoo-commits] portage r9955 - main/trunk/pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-04-24 02:55:58 +0000 (Thu, 24 Apr 2008)
New Revision: 9955

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
Handle potential InvalidDependString exceptions when match packages to
system and world atoms in depgraph.altlist().


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-04-24 02:48:45 UTC (rev 9954)
+++ main/trunk/pym/_emerge/__init__.py	2008-04-24 02:55:58 UTC (rev 9955)
@@ -3508,10 +3508,13 @@
 					# by a normal upgrade operation then require
 					# user intervention.
 					skip = False
-					for atom in root_config.sets[
-						"system"].iterAtomsForPackage(task):
+					try:
+						for atom in root_config.sets[
+							"system"].iterAtomsForPackage(task):
+							skip = True
+							break
+					except portage.exception.InvalidDependString:
 						skip = True
-						break
 					if skip:
 						continue
 
@@ -3519,17 +3522,21 @@
 					# when necessary, as long as the atom will be satisfied
 					# in the final state.
 					graph_db = self.mydbapi[task.root]
-					for atom in root_config.sets[
-						"world"].iterAtomsForPackage(task):
-						satisfied = False
-						for cpv in graph_db.match(atom):
-							if cpv == inst_pkg.cpv and inst_pkg in graph_db:
-								continue
-							satisfied = True
-							break
-						if not satisfied:
-							skip = True
-							break
+					try:
+						for atom in root_config.sets[
+							"world"].iterAtomsForPackage(task):
+							satisfied = False
+							for cpv in graph_db.match(atom):
+								if cpv == inst_pkg.cpv and \
+									inst_pkg in graph_db:
+									continue
+								satisfied = True
+								break
+							if not satisfied:
+								skip = True
+								break
+					except portage.exception.InvalidDependString:
+						skip = True
 					if skip:
 						continue
 

-- 
gentoo-commits@l.g.o mailing list