From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 10 Apr 2008 08:41:28 +0000 (-0000)
Subject: Make sure that everything except Package nodes is ignored when doing
X-Git-Tag: v2.2_pre6~203
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1caa4c4bfc6222f769c83cd6660a0e8cf86d8e9e;p=portage.git

Make sure that everything except Package nodes is ignored when doing
the --buildpkgonly digraph.hasallzeros() check.

svn path=/main/trunk/; revision=9797
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 0e5a64f9d..6eae62d11 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -7130,14 +7130,22 @@ def action_build(settings, trees, mtimedb,
 				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