diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-06-28 19:40:39 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-06-28 19:40:39 +0000 |
| commit | 58ba036b77ce5b2250e54a4d4742d1c7c08efb4b (patch) | |
| tree | 30f3bf74661166e4f96cb804b4a1c3c03795d4f9 /pym/_emerge/Package.py | |
| parent | 6848505d7e7cb330d85ea2d16b0041ef68125677 (diff) | |
| download | portage-58ba036b77ce5b2250e54a4d4742d1c7c08efb4b.tar.gz portage-58ba036b77ce5b2250e54a4d4742d1c7c08efb4b.tar.bz2 portage-58ba036b77ce5b2250e54a4d4742d1c7c08efb4b.zip | |
Use Package.invalid to generate *.syntax repoman errors for LICENSE,
PROPERTIES, PROVIDE, and RESTRICT.
svn path=/main/trunk/; revision=13728
Diffstat (limited to 'pym/_emerge/Package.py')
| -rw-r--r-- | pym/_emerge/Package.py | 10 |
1 files changed, 3 insertions, 7 deletions
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(). |