diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-07-09 19:07:54 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-07-09 19:07:54 +0000 |
| commit | d5267ba3740d6a9a3c84981edc8c5456da31213d (patch) | |
| tree | 3660e736835cd55b6bc8479d85178fa6edd05003 | |
| parent | e2f3175ac01f5c9e97e53b087c92bacb96db6e48 (diff) | |
| download | portage-d5267ba3740d6a9a3c84981edc8c5456da31213d.tar.gz portage-d5267ba3740d6a9a3c84981edc8c5456da31213d.tar.bz2 portage-d5267ba3740d6a9a3c84981edc8c5456da31213d.zip | |
Use dbapi to unify config.setinst() call in depgraph.select_dep().
svn path=/main/trunk/; revision=3820
| -rwxr-xr-x | bin/emerge | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge index 568f156a5..701684bf9 100755 --- a/bin/emerge +++ b/bin/emerge @@ -982,10 +982,8 @@ class depgraph: myp = myparent.split() if myp[3]=="merge": self.mydbapi[myroot].cpv_inject(myp[2]) - if myp[0]=="binary": - pkgsettings.setinst(myp[2], bindb) - else: - pkgsettings.setinst(myp[2], portdb) + pkgsettings.setinst(myp[2], + self.trees[myroot][self.pkg_tree_map[myp[0]]].dbapi) if not mymerge: return 1 |