From 58ba036b77ce5b2250e54a4d4742d1c7c08efb4b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 28 Jun 2009 19:40:39 +0000 Subject: Use Package.invalid to generate *.syntax repoman errors for LICENSE, PROPERTIES, PROVIDE, and RESTRICT. svn path=/main/trunk/; revision=13728 --- pym/_emerge/Package.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index 512703b83..c2eaf0ee6 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -187,14 +187,10 @@ class _PackageMetadataWrapper(_PackageMetadataWrapperBase): def __getitem__(self, k): v = _PackageMetadataWrapperBase.__getitem__(self, k) if k in self._use_conditional_keys: - if '?' in v: + if self._pkg.root_config.settings.local_config and '?' in v: try: - 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))) + v = paren_enclose(paren_normalize(use_reduce( + paren_reduce(v), uselist=self._pkg.use.enabled))) except portage.exception.InvalidDependString: # This error should already have been registered via # self._pkg._invalid_metadata(). -- cgit v1.2.3-1-g7c22