From: Zac Medico Date: Thu, 7 Oct 2010 02:16:46 +0000 (-0700) Subject: Revert "Handle negated atoms in getmaskingreason()." X-Git-Tag: v2.2_rc91~19 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f6298b50b16bb04cf880a70ec3d651341f8a6dff;p=portage.git Revert "Handle negated atoms in getmaskingreason()." 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. --- diff --git a/pym/portage/package/ebuild/getmaskingreason.py b/pym/portage/package/ebuild/getmaskingreason.py index 1bc0d8e42..044546179 100644 --- a/pym/portage/package/ebuild/getmaskingreason.py +++ b/pym/portage/package/ebuild/getmaskingreason.py @@ -60,16 +60,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] == "#":