diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-27 05:42:28 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-27 05:42:28 +0000 |
| commit | f40cfd27beeb39d1027e59f4bd70c951d22a9f0f (patch) | |
| tree | 6019ad446fb78318d995e3918e589c33dfa6fd57 /pym | |
| parent | ee97a2940c2446deccfc040ea4df3cbeaf267b31 (diff) | |
| download | portage-f40cfd27beeb39d1027e59f4bd70c951d22a9f0f.tar.gz portage-f40cfd27beeb39d1027e59f4bd70c951d22a9f0f.tar.bz2 portage-f40cfd27beeb39d1027e59f4bd70c951d22a9f0f.zip | |
Repoman only checks IUSE for USE deps, so don't evaluate conditional USE deps
in this case.
svn path=/main/trunk/; revision=10446
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index d9021a466..1ff6f25b8 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -5410,6 +5410,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) if kwargs["use_binaries"]: portdb = trees[myroot]["bintree"].dbapi myvirtuals = mysettings.getvirtuals() @@ -5431,7 +5432,10 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", raise portage.exception.ParseError( "invalid atom: '%s'" % x) - if isinstance(x, portage.dep.Atom) and x.use: + # Repoman only checks IUSE for USE deps, so there's + # no need to evaluate conditionals. + if not repoman and \ + myuse is not None and isinstance(x, portage.dep.Atom) and x.use: if x.use.conditional: evaluated_atom = portage.dep.remove_slot(x) if x.slot: |