From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 4 Sep 2006 22:35:17 +0000 (-0000)
Subject: Revert r4403 since dep_check needs a config instance for the $ROOT where the dependen... 
X-Git-Tag: v2.1.1~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=86c96334c5282e19ab47c827d0585d0e34b2caa4;p=portage.git

Revert r4403 since dep_check needs a config instance for the $ROOT where the dependencies will be installed.

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

diff --git a/bin/emerge b/bin/emerge
index e18aa7794..5bcb6eaa4 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1017,15 +1017,8 @@ class depgraph:
 			#processing dependencies
 			""" Call portage.dep_check to evaluate the use? conditionals and make sure all
 			dependencies are satisfiable. """
-			if myparent:
-				p_type, p_root, p_key, p_status = myparent.split()
-				dep_settings = self.pkgsettings[p_root]
-				dep_settings.setcpv(p_key)
-			else:
-				dep_settings = self.pkgsettings[self.target_root]
-				dep_settings.reset()
 			mycheck = portage.dep_check(depstring, self.mydbapi[myroot],
-				dep_settings, myuse=myuse,
+				pkgsettings, myuse=myuse,
 				use_binaries=("--usepkgonly" in self.myopts),
 				myroot=myroot, trees=self.trees)