From 33d0d332bc99bf8b2d53f237f3ffc5d19ae62b30 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 14 Jan 2009 06:00:31 +0000 Subject: Fix repoman conditionals inside _expand_new_virtuals() to use config.local_config instead of checking for portdbapi type. svn path=/main/trunk/; revision=12514 --- pym/portage/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index c0223dd63..19a0ab656 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 -- cgit v1.2.3-1-g7c22