projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c15dc09
)
Handle negated atoms in getmaskingreason().
author
Zac Medico
<zmedico@gentoo.org>
Wed, 6 Oct 2010 03:59:52 +0000
(20:59 -0700)
committer
Zac Medico
<zmedico@gentoo.org>
Wed, 6 Oct 2010 23:26:50 +0000
(16:26 -0700)
pym/portage/package/ebuild/getmaskingreason.py
patch
|
blob
|
history
diff --git
a/pym/portage/package/ebuild/getmaskingreason.py
b/pym/portage/package/ebuild/getmaskingreason.py
index 83757b798b805001be83d05953c8f1ed03501a35..fa38493782a56c8bda6893b51d1f33e725e55653 100644
(file)
--- a/
pym/portage/package/ebuild/getmaskingreason.py
+++ b/
pym/portage/package/ebuild/getmaskingreason.py
@@
-57,12
+57,16
@@
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 == "":
+ if l[:1] == '-':
+ negated_atom = True
+
+ if negated_atom or not l:
comment = ""
comment_valid = -1
elif l[0] == "#":