[gentoo-commits] portage r12020 - in main/trunk/pym: _emerge portage

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-11-21 22:31:08 +0000 (Fri, 21 Nov 2008)
New Revision: 12020

Modified:
   main/trunk/pym/_emerge/__init__.py
   main/trunk/pym/portage/__init__.py
Log:
Bug #248059 - Make --depclean more tolerant of invalid atoms in dependencies
of packages that will be uninstalled anyway.


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-11-21 21:57:02 UTC (rev 12019)
+++ main/trunk/pym/_emerge/__init__.py	2008-11-21 22:31:08 UTC (rev 12020)
@@ -12776,11 +12776,10 @@
 				finally:
 					portage.dep._dep_check_strict = True
 				if not success:
-					show_invalid_depstring_notice(
-						("installed", myroot, node, "nomerge"),
-						depstr, atoms)
-					return
- 
+					# Ignore invalid deps of packages that will
+					# be uninstalled anyway.
+					continue
+
 				priority = priority_map[dep_type]
 				for atom in atoms:
 					if not isinstance(atom, portage.dep.Atom):

Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py	2008-11-21 21:57:02 UTC (rev 12019)
+++ main/trunk/pym/portage/__init__.py	2008-11-21 22:31:08 UTC (rev 12020)
@@ -6614,8 +6614,16 @@
 	writemsg("mysplit:  %s\n" % (mysplit), 1)
 	writemsg("mysplit2: %s\n" % (mysplit2), 1)
 
-	myzaps = dep_zapdeps(mysplit, mysplit2, myroot,
-		use_binaries=use_binaries, trees=trees)
+	try:
+		myzaps = dep_zapdeps(mysplit, mysplit2, myroot,
+			use_binaries=use_binaries, trees=trees)
+	except portage.exception.InvalidAtom, e:
+		if portage.dep._dep_check_strict:
+			raise # This shouldn't happen.
+		# dbapi.match() failed due to an invalid atom in
+		# the dependencies of an installed package.
+		return [0, "Invalid atom: '%s'" % (e,)]
+
 	mylist = flatten(myzaps)
 	writemsg("myzaps:   %s\n" % (myzaps), 1)
 	writemsg("mylist:   %s\n" % (mylist), 1)