diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-09-04 22:35:17 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-09-04 22:35:17 +0000 |
| commit | 86c96334c5282e19ab47c827d0585d0e34b2caa4 (patch) | |
| tree | 48dd62c9dabc694c19d6d971430dcc25bb0760c9 | |
| parent | 9aa0e5d0bb3d697fd9fdf0fc7349f1d0ac1f0d35 (diff) | |
| download | portage-86c96334c5282e19ab47c827d0585d0e34b2caa4.tar.gz portage-86c96334c5282e19ab47c827d0585d0e34b2caa4.tar.bz2 portage-86c96334c5282e19ab47c827d0585d0e34b2caa4.zip | |
Revert r4403 since dep_check needs a config instance for the $ROOT where the dependencies will be installed.
svn path=/main/trunk/; revision=4406
| -rwxr-xr-x | bin/emerge | 9 |
1 files changed, 1 insertions, 8 deletions
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) |