From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 14 Jan 2009 07:48:49 +0000 (-0000)
Subject: Fix repoman conditionals inside _expand_new_virtuals() to use
X-Git-Tag: v2.1.6.6
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=04336e6710fbb88ca1c503020f8abe3d1d79592a;p=portage.git

Fix repoman conditionals inside _expand_new_virtuals() to use
config.local_config instead of checking for portdbapi type. (trunk r12514)

svn path=/main/branches/2.1.6/; revision=12515
---

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