From 58274867ff71e79c8716334ef13f92eb37886d6b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 11 Apr 2008 20:23:01 +0000 Subject: Fix the code from the previous commit so that it doesn't try to pull USE from a portdbapi instance (like when called by repoman) since portdbapi doesn't return USE in aux_get() calls. svn path=/main/trunk/; revision=9840 --- pym/portage/__init__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index b5227b1e0..7ec4b95d9 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -5366,9 +5366,14 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", for y in pkgs: cpv, pv_split, db = y depstring = " ".join(db.aux_get(cpv, dep_keys)) - use_split = db.aux_get(cpv, ["USE"])[0].split() pkg_kwargs = kwargs.copy() - pkg_kwargs["myuse"] = use_split + if isinstance(db, portdbapi): + # for repoman + pass + else: + # for emerge + use_split = db.aux_get(cpv, ["USE"])[0].split() + pkg_kwargs["myuse"] = use_split if edebug: print "Virtual Parent: ", y[0] print "Virtual Depstring:", depstring -- cgit v1.2.3-1-g7c22