diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-01-14 07:48:49 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-01-14 07:48:49 +0000 |
| commit | 04336e6710fbb88ca1c503020f8abe3d1d79592a (patch) | |
| tree | dbcf5303aac97631f562e5d98b2aa4091ca1b776 /pym/portage/__init__.py | |
| parent | 921b10d4953052a7c61a6142670d4b6df80a718c (diff) | |
| download | portage-04336e6710fbb88ca1c503020f8abe3d1d79592a.tar.gz portage-04336e6710fbb88ca1c503020f8abe3d1d79592a.tar.bz2 portage-04336e6710fbb88ca1c503020f8abe3d1d79592a.zip | |
Fix repoman conditionals inside _expand_new_virtuals() to usev2.1.6.6
config.local_config instead of checking for portdbapi type. (trunk r12514)
svn path=/main/branches/2.1.6/; revision=12515
Diffstat (limited to 'pym/portage/__init__.py')
| -rw-r--r-- | pym/portage/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 4a9ba082e..97ee03ec5 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -6289,7 +6289,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", # for new-style virtuals. Repoman should enforce this. dep_keys = ["RDEPEND", "DEPEND", "PDEPEND"] portdb = trees[myroot]["porttree"].dbapi - repoman = isinstance(mydbapi, portdbapi) + repoman = not mysettings.local_config if kwargs["use_binaries"]: portdb = trees[myroot]["bintree"].dbapi myvirtuals = mysettings.getvirtuals() @@ -6371,8 +6371,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", cpv, pv_split, db = y depstring = " ".join(db.aux_get(cpv, dep_keys)) pkg_kwargs = kwargs.copy() - if isinstance(db, portdbapi): - # for repoman + if repoman: pass else: # for emerge |