Merged from trunk 11209:11210

   | 11210   | * Define a frozenset of live eclasses for the LIVEVCS.stable |
   | zmedico | check. * Add "mercurial" to the list of known live eclasses. |

svn path=/main/branches/prefix/; revision=11212

diff --git a/bin/repoman b/bin/repoman
index 018eb36fc27841d0a562a1c9961289ba00f234fc..d07610fcdfaf1ff292fa594213f85a38850ba0f1 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -372,6 +372,14 @@ valid_restrict = frozenset(["binchecks", "bindist",
        "fetch", "installsources", "mirror",
        "primaryuri", "strip", "test", "userpriv"])
 
+live_eclasses = frozenset([
+       "cvs",
+       "darcs",
+       "git",
+       "mercurial",
+       "subversion"
+])
+
 suspect_rdepend = frozenset([
        "app-arch/cabextract",
        "app-arch/rpm2targz",
@@ -1220,10 +1228,9 @@ for x in scanlist:
                Ebuilds that inherit a "Live" eclass (darcs,subversion,git,cvs,etc..) should
                not be allowed to be marked stable
                """
-               if set(["darcs","cvs","subversion","git"]).intersection(
-                       myaux["INHERITED"].split()):
+               if live_eclasses.intersection(pkg.inherited):
                        bad_stable_keywords = []
-                       for keyword in myaux["KEYWORDS"].split():
+                       for keyword in keywords:
                                if not keyword.startswith("~") and \
                                        not keyword.startswith("-"):
                                        bad_stable_keywords.append(keyword)