summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-01-14 06:00:31 +0000
committerZac Medico <zmedico@gentoo.org>2009-01-14 06:00:31 +0000
commit33d0d332bc99bf8b2d53f237f3ffc5d19ae62b30 (patch)
treed80bf458df7c01b4e2a8006c53e055e840b43a4f
parentAdd some more variables to config._env_blacklist to ensure that they never (diff)
downloadportage-multirepo-2.2_rc22.tar.gz
portage-multirepo-2.2_rc22.tar.bz2
portage-multirepo-2.2_rc22.zip
Fix repoman conditionals inside _expand_new_virtuals() to usev2.2_rc22
config.local_config instead of checking for portdbapi type. svn path=/main/trunk/; revision=12514
-rw-r--r--pym/portage/__init__.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index c0223dd6..19a0ab65 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -6302,7 +6302,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()
@@ -6384,8 +6384,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