From 80d8bce1a6be1f869d7eb26247ae14351193fa7a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 26 Jun 2009 23:01:46 +0000 Subject: Fix PROVIDE code since the Package class automatically evaluates USE conditionals now. svn path=/main/trunk/; revision=13702 --- pym/_emerge/Package.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pym') 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(). -- cgit v1.2.3-1-g7c22