diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-11 20:23:01 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-11 20:23:01 +0000 |
| commit | 58274867ff71e79c8716334ef13f92eb37886d6b (patch) | |
| tree | 2033aa9419b988cb90996f6aa1322c6122a4d243 | |
| parent | 882da0c75eee6d517f51835f16d11a6e50858769 (diff) | |
| download | portage-58274867ff71e79c8716334ef13f92eb37886d6b.tar.gz portage-58274867ff71e79c8716334ef13f92eb37886d6b.tar.bz2 portage-58274867ff71e79c8716334ef13f92eb37886d6b.zip | |
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
| -rw-r--r-- | pym/portage/__init__.py | 9 |
1 files 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 |