diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-10-06 19:16:46 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-10-06 19:31:16 -0700 |
| commit | 733b0dcddd6f8016e05cdc91567e0d8d54537926 (patch) | |
| tree | 584944a50f854fcdd8ccb6ee2ea31eaeb062521a | |
| parent | ab5e0d97e410c9fbb0ebe666e6abaf93d87b326e (diff) | |
| download | portage-733b0dcddd6f8016e05cdc91567e0d8d54537926.tar.gz portage-733b0dcddd6f8016e05cdc91567e0d8d54537926.tar.bz2 portage-733b0dcddd6f8016e05cdc91567e0d8d54537926.zip | |
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.
| -rw-r--r-- | pym/portage/package/ebuild/getmaskingreason.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pym/portage/package/ebuild/getmaskingreason.py b/pym/portage/package/ebuild/getmaskingreason.py index fa3849378..83757b798 100644 --- a/pym/portage/package/ebuild/getmaskingreason.py +++ b/pym/portage/package/ebuild/getmaskingreason.py @@ -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] == "#": |