diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-06-26 23:01:46 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-06-26 23:01:46 +0000 |
commit | 80d8bce1a6be1f869d7eb26247ae14351193fa7a (patch) | |
tree | 4e1c05e61a8c7f5145e089dedc49c72213160e72 /pym | |
parent | a41de90811b4af4dd9f5cd8217be26d42976060d (diff) | |
download | portage-80d8bce1a6be1f869d7eb26247ae14351193fa7a.tar.gz portage-80d8bce1a6be1f869d7eb26247ae14351193fa7a.tar.bz2 portage-80d8bce1a6be1f869d7eb26247ae14351193fa7a.zip |
Fix PROVIDE code since the Package class automatically evaluates USE
conditionals now.
svn path=/main/trunk/; revision=13702
Diffstat (limited to 'pym')
-rw-r--r-- | pym/_emerge/Package.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index 1d90975c7..938c17733 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -185,8 +185,12 @@ class _PackageMetadataWrapper(_PackageMetadataWrapperBase): if k in self._use_conditional_keys: if '?' in v: try: - v = paren_enclose(paren_normalize(use_reduce( - paren_reduce(v), uselist=self._pkg.use.enabled))) + if self._pkg.root_config.settings.local_config: + v = paren_enclose(paren_normalize(use_reduce( + paren_reduce(v), uselist=self._pkg.use.enabled))) + else: + v = paren_enclose(paren_normalize(use_reduce( + paren_reduce(v), matchall=1))) except portage.exception.InvalidDependString: # This error should already have been registered via # self._pkg._invalid_metadata(). |