For getmaskingstatus messages, don't assume ARCH is a valid keyword, since that assum...
authorZac Medico <zmedico@gentoo.org>
Mon, 30 Oct 2006 01:48:58 +0000 (01:48 -0000)
committerZac Medico <zmedico@gentoo.org>
Mon, 30 Oct 2006 01:48:58 +0000 (01:48 -0000)
svn path=/main/trunk/; revision=4879

pym/portage.py

index f527ad826741a643e4b6ab21c814c947ca74b3b7..c20b44a0c242ca22a04398544bbfc5b36d889f92 100644 (file)
@@ -3958,6 +3958,10 @@ def getmaskingstatus(mycpv, settings=None, portdb=None):
        mygroups = mygroups.split()
        pgroups = settings["ACCEPT_KEYWORDS"].split()
        myarch = settings["ARCH"]
+       if pgroups and myarch not in pgroups:
+               """For operating systems other than Linux, ARCH is not necessarily a
+               valid keyword."""
+               myarch = pgroups[0].lstrip("~")
        pkgdict = settings.pkeywordsdict
 
        cp = dep_getkey(mycpv)