Revert "Handle negated atoms in getmaskingreason()."
authorZac Medico <zmedico@gentoo.org>
Thu, 7 Oct 2010 02:16:46 +0000 (19:16 -0700)
committerZac Medico <zmedico@gentoo.org>
Thu, 7 Oct 2010 02:31:16 +0000 (19:31 -0700)
There's really no need for a special case here since they can be treated
like normal atoms that don't match the atom that's being searched for.
This reverts commit 76b4a2fdd777f7203428a9c8a5a0c434fff55252.

pym/portage/package/ebuild/getmaskingreason.py

index fa38493782a56c8bda6893b51d1f33e725e55653..83757b798b805001be83d05953c8f1ed03501a35 100644 (file)
@@ -57,16 +57,12 @@ def getmaskingreason(mycpv, metadata=None, settings=None, portdb=None, return_lo
                                        pmask_filename = os.path.join(pmask[0], "package.mask")
                                        for i in range(len(pmask[1])):
                                                l = pmask[1][i].strip()
-                                               negated_atom = False
                                                try:
                                                        l_atom = Atom(l, allow_repo=True,
                                                                allow_wildcard=True).without_repo
                                                except InvalidAtom:
                                                        l_atom = None
-                                                       if l[:1] == '-':
-                                                               negated_atom = True
-
-                                               if negated_atom or not l:
+                                               if l == "":
                                                        comment = ""
                                                        comment_valid = -1
                                                elif l[0] == "#":