From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 20 Aug 2010 00:01:16 +0000 (-0700)
Subject: Eliminate the bdeps_optional variables inside depgraph._add_pkg_deps(),
X-Git-Tag: v2.2_rc68~73
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cb79ccb754f91d106a69dbce7965a226884950ed;p=portage.git

Eliminate the bdeps_optional variables inside depgraph._add_pkg_deps(),
and use the pkg.built attribute instead.
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index f2950fb66..d35d8fd7a 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -979,7 +979,6 @@ class depgraph(object):
 			"empty" not in self._dynamic_config.myparams:
 			edepend["RDEPEND"] = ""
 			edepend["PDEPEND"] = ""
-		bdeps_optional = False
 
 		if pkg.built and not removal_action:
 			if self._frozen_config.myopts.get("--with-bdeps", "n") == "y":
@@ -990,7 +989,7 @@ class depgraph(object):
 				# could make --with-bdeps=y less effective if it is used to
 				# adjust merge order to prevent built_with_use() calls from
 				# failing.
-				bdeps_optional = True
+				pass
 			else:
 				# built packages do not have build time dependencies.
 				edepend["DEPEND"] = ""
@@ -1011,8 +1010,8 @@ class depgraph(object):
 
 		deps = (
 			(bdeps_root, edepend["DEPEND"],
-				self._priority(buildtime=(not bdeps_optional),
-				optional=bdeps_optional),
+				self._priority(buildtime=(not pkg.built),
+				optional=pkg.built),
 				pkg.built),
 			(myroot, edepend["RDEPEND"],
 				self._priority(runtime=True),