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:16:46 -0700 |
| commit | f6298b50b16bb04cf880a70ec3d651341f8a6dff (patch) | |
| tree | 881090ca0b1814af0554d40c1d47e103d12fbcd5 | |
| parent | f99ec8bbfeaea6548aff2d5628262fc12984a6ca (diff) | |
| download | portage-f6298b50b16bb04cf880a70ec3d651341f8a6dff.tar.gz portage-f6298b50b16bb04cf880a70ec3d651341f8a6dff.tar.bz2 portage-f6298b50b16bb04cf880a70ec3d651341f8a6dff.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 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] == "#": |