diff options
author | Zac Medico <zmedico@gentoo.org> | 2006-09-04 19:50:52 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2006-09-04 19:50:52 +0000 |
commit | 47164587531641e8bcfbbfe59c7550de89ac2e55 (patch) | |
tree | 74ae4351853bec24947d718e6b40781239535625 | |
parent | 61fddaa93a08d593ad8e5a7ace10c792de57b488 (diff) | |
download | portage-47164587531641e8bcfbbfe59c7550de89ac2e55.tar.gz portage-47164587531641e8bcfbbfe59c7550de89ac2e55.tar.bz2 portage-47164587531641e8bcfbbfe59c7550de89ac2e55.zip |
For emerge dep_check calls, use a config instance that has the correct state and the correct $ROOT.
svn path=/main/trunk/; revision=4403
-rwxr-xr-x | bin/emerge | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index 5bcb6eaa4..e18aa7794 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1017,8 +1017,15 @@ 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], - pkgsettings, myuse=myuse, + dep_settings, myuse=myuse, use_binaries=("--usepkgonly" in self.myopts), myroot=myroot, trees=self.trees) |