diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-18 08:23:18 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-18 08:23:18 +0000 |
| commit | eaa624f4cef9aca474202bacc898bd9828196e71 (patch) | |
| tree | 6a4a2a4837a4c9487dd30dba148c3802a4ecdb7b /pym | |
| parent | 8edcd65bff3611da80b35e13538a70620d6469e6 (diff) | |
| download | portage-eaa624f4cef9aca474202bacc898bd9828196e71.tar.gz portage-eaa624f4cef9aca474202bacc898bd9828196e71.tar.bz2 portage-eaa624f4cef9aca474202bacc898bd9828196e71.zip | |
For bug #163990, warn about ebuilds with invalid categories and do not allow them to be installed. (trunk r5987:5988)
svn path=/main/branches/2.1.2/; revision=5989
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py index fe023f378..1691d96a5 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -5610,7 +5610,7 @@ class portdbapi(dbapi): else: global settings self.mysettings = config(clone=settings) - + self._categories = set(self.mysettings.categories) # This is strictly for use in aux_get() doebuild calls when metadata # is generated by the depend phase. It's safest to use a clone for # this purpose because doebuild makes many changes to the config @@ -6026,6 +6026,7 @@ class portdbapi(dbapi): def cp_list(self, mycp, use_cache=1, mytree=None): mysplit=mycp.split("/") + invalid_category = mysplit[0] not in self._categories d={} if mytree: mytrees = [mytree] @@ -6041,6 +6042,10 @@ class portdbapi(dbapi): os.path.join(oroot, mycp, x), noiselevel=-1) continue d[mysplit[0]+"/"+pf] = None + if invalid_category and d: + writemsg(("\n!!! '%s' has a category that is not listed in " + \ + "/etc/portage/categories\n") % mycp, noiselevel=-1) + return [] return d.keys() def freeze(self): |