diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-09-25 11:25:15 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-09-25 11:25:15 -0700 |
| commit | 9d84d008d1261405d22de537d8672d67791a9271 (patch) | |
| tree | 792ad1213df7c5459ec4da66887d98f9368a51dc /pym | |
| parent | 824631135d50c58a2176a724df2a68b9b9ae9501 (diff) | |
| download | portage-9d84d008d1261405d22de537d8672d67791a9271.tar.gz portage-9d84d008d1261405d22de537d8672d67791a9271.tar.bz2 portage-9d84d008d1261405d22de537d8672d67791a9271.zip | |
repoman: rename most *DEPEND.* to dependency.*
This makes it easier to add new types, like HDEPEND.
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/Package.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index af329a128..00d00fe25 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -373,6 +373,11 @@ class Package(Task): def _metadata_exception(self, k, e): + if k.endswith('DEPEND'): + qacat = 'dependency.syntax' + else: + qacat = k + ".syntax" + # For unicode safety with python-2.x we need to avoid # using the string format operator with a non-unicode # format string, since that will result in the @@ -393,7 +398,7 @@ class Package(Task): _unicode_decode("%s: %s") % (k, error)) if not categorized_error: - self._invalid_metadata(k + ".syntax", + self._invalid_metadata(qacat, _unicode_decode("%s: %s") % (k, e)) else: # For installed packages, show the path of the file @@ -401,7 +406,7 @@ class Package(Task): # want to fix the deps by hand. vardb = self.root_config.trees['vartree'].dbapi path = vardb.getpath(self.cpv, filename=k) - self._invalid_metadata(k + ".syntax", + self._invalid_metadata(qacat, _unicode_decode("%s: %s in '%s'") % (k, e, path)) def _invalid_metadata(self, msg_type, msg): |