[gentoo-commits] portage r9798 - main/branches/2.1.2/bin

[gentoo-commits] portage r9798 - main/branches/2.1.2/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-04-10 08:43:34 +0000 (Thu, 10 Apr 2008)
New Revision: 9798

Modified:
   main/branches/2.1.2/bin/emerge
Log:
Make sure that everything except Package nodes is ignored when doing
the --buildpkgonly digraph.hasallzeros() check. (trunk r9797)


Modified: main/branches/2.1.2/bin/emerge
===================================================================
--- main/branches/2.1.2/bin/emerge	2008-04-10 08:41:28 UTC (rev 9797)
+++ main/branches/2.1.2/bin/emerge	2008-04-10 08:43:34 UTC (rev 9798)
@@ -7142,14 +7142,22 @@
 				favorites=favorites)
 			if retval != os.EX_OK:
 				return retval
-			if "--buildpkgonly" in myopts and \
-				not mydepgraph.digraph.hasallzeros(ignore_priority=DepPriority.MEDIUM):
+			if "--buildpkgonly" in myopts:
+				graph_copy = mydepgraph.digraph.clone()
+				for node in graph_copy.order:
+					if not isinstance(node, Package):
+						graph_copy.remove(node)
+				if not graph_copy.hasallzeros(ignore_priority=DepPriority.MEDIUM):
 					print "\n!!! --buildpkgonly requires all dependencies to be merged."
 					print "!!! You have to merge the dependencies before you can build this package.\n"
 					return 1
 	else:
-		if ("--buildpkgonly" in myopts):
-			if not mydepgraph.digraph.hasallzeros(ignore_priority=DepPriority.MEDIUM):
+		if "--buildpkgonly" in myopts:
+			graph_copy = mydepgraph.digraph.clone()
+			for node in graph_copy.order:
+				if not isinstance(node, Package):
+					graph_copy.remove(node)
+			if not graph_copy.hasallzeros(ignore_priority=DepPriority.MEDIUM):
 				print "\n!!! --buildpkgonly requires all dependencies to be merged."
 				print "!!! Cannot merge requested packages. Merge deps and try again.\n"
 				return 1

-- 
gentoo-commits@lists.gentoo.org mailing list