Bug #292820 - Make the Package constructor handle invalid SLOT values.

svn path=/main/trunk/; revision=14819

diff --git a/bin/repoman b/bin/repoman
index 74bbdab922b20c9d5bf6512a1f78e0f586089fb2..0df7c00aeeb171b4026ad182bff384f8e2e640b9 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -283,6 +283,7 @@ qahelp={
        "EAPI.definition":"EAPI is defined after an inherit call (must be defined before)",
        "EAPI.incompatible":"Ebuilds that use features that are only available with a different EAPI",
        "EAPI.unsupported":"Ebuilds that have an unsupported EAPI version (you must upgrade portage)",
+       "SLOT.invalid":"Ebuilds that have an invalid SLOT variable value",
        "SLOT.missing":"Ebuilds that have a missing or empty SLOT variable",
        "HOMEPAGE.missing":"Ebuilds that have a missing or empty HOMEPAGE variable",
        "DEPEND.bad":"User-visible ebuilds with bad DEPEND settings (matched against *visible* ebuilds)",

diff --git a/man/repoman.1 b/man/repoman.1
index 4ca110fab34972120b98365fb8ae891694203e93..5fab376b605a63e71f7ea4b676dd48321d25b476 100644 (file)
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -206,6 +206,8 @@ Syntax error in PROPERTIES (usually an extra/missing space/parenthesis)
 .TP
 .B RESTRICT.syntax
 Syntax error in RESTRICT (usually an extra/missing space/parenthesis)
+.B SLOT.invalid
+Ebuilds that have an invalid SLOT variable value
 .TP
 .B SLOT.missing
 Ebuilds that have a missing or empty SLOT variable

diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py
index d6970b5f217c6296e743768de4b8e4c7e228cbee..dc8b975e60a4f258c2e3ad82d6abcafd0faa3a66 100644 (file)
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@ -8,7 +8,7 @@ from itertools import chain
 import portage
 from portage.cache.mappings import slot_dict_class
 from portage.dep import paren_reduce, use_reduce, \
-       paren_normalize, paren_enclose
+       paren_normalize, paren_enclose, _slot_re
 from _emerge.Task import Task
 
 if sys.hexversion >= 0x3000000:
@@ -40,7 +40,9 @@ class Package(Task):
                        self.metadata['CHOST'] = self.root_config.settings.get('CHOST', '')
                self.cp = portage.cpv_getkey(self.cpv)
                slot = self.slot
-               if not slot:
+               if _slot_re.match(slot) is None:
+                       self._invalid_metadata('SLOT.invalid',
+                               "SLOT: invalid value: '%s'" % slot)
                        # Avoid an InvalidAtom exception when creating slot_atom.
                        # This package instance will be masked due to empty SLOT.
                        slot = '0'