Fix repoman conditionals inside _expand_new_virtuals() to use
config.local_config instead of checking for portdbapi type.
svn path=/main/trunk/; revision=12514
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index c0223dd..19a0ab6 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -6302,7 +6302,7 @@
# 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 @@
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
