diff options
| author | fuzzyray <fuzzyray@gentoo.org> | 2010-01-08 21:46:01 +0000 |
|---|---|---|
| committer | fuzzyray <fuzzyray@gentoo.org> | 2010-01-08 21:46:01 +0000 |
| commit | 31878aeb14719b1cfe8aa1115f47dc0ed7692841 (patch) | |
| tree | 6ad2d075c7fd45928161eba28f4c5f4d17102b60 /pym | |
| parent | ede9a484b6555c01fce32383aa9b4e909c73c2eb (diff) | |
| download | gentoolkit-31878aeb14719b1cfe8aa1115f47dc0ed7692841.tar.gz | |
Merge genscripts rev 146. This changes the unknown masking status in equery list to [??] instead of [XX]. Bug 273096
svn path=/trunk/gentoolkit/; revision=733
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/gentoolkit/dependencies.py | 8 | ||||
| -rw-r--r-- | pym/gentoolkit/package.py | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/pym/gentoolkit/dependencies.py b/pym/gentoolkit/dependencies.py index 001483e..3a3c734 100644 --- a/pym/gentoolkit/dependencies.py +++ b/pym/gentoolkit/dependencies.py @@ -1,4 +1,4 @@ -# Copyright(c) 2009-2010, Gentoo Foundation +# Copyright(c) 2009, Gentoo Foundation # # Licensed under the GNU General Public License, v2 # @@ -307,6 +307,12 @@ class Dependencies(CPV): result.extend(sub_r) use_conditional = None continue + # FIXME: This is a quick fix for bug #299260. + # A better fix is to not discard blockers in the parser, + # but to check for atom.blocker in whatever equery/depends + # (in this case) and ignore them there. + # TODO: Test to see how much a performance impact ignoring + # blockers here rather than checking for atom.blocker has. if tok[0] == '!': # We're not interested in blockers continue diff --git a/pym/gentoolkit/package.py b/pym/gentoolkit/package.py index 7054470..ee8c83e 100644 --- a/pym/gentoolkit/package.py +++ b/pym/gentoolkit/package.py @@ -1,7 +1,7 @@ #!/usr/bin/python # # Copyright(c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org> -# Copyright(c) 2004-2010, Gentoo Foundation +# Copyright(c) 2004-2009, Gentoo Foundation # # Licensed under the GNU General Public License, v2 # @@ -381,14 +381,14 @@ class PackageFormatter(object): def __str__(self): if self.do_format: - maskmodes = [' ', ' ~', ' -', 'M ', 'M~', 'M-', 'XX'] + maskmodes = [' ', ' ~', ' -', 'M ', 'M~', 'M-', '??'] maskmode = maskmodes[self.format_mask_status()[0]] return "[%(location)s] [%(mask)s] %(package)s:%(slot)s" % { 'location': self.location, 'mask': pp.keyword( maskmode, stable=not maskmode.strip(), - hard_masked=set(('M', 'X', '-')).intersection(maskmode) + hard_masked=set(('M', '?', '-')).intersection(maskmode) ), 'package': pp.cpv(str(self.pkg.cpv)), 'slot': pp.slot(self.pkg.environment("SLOT")) @@ -429,7 +429,7 @@ class PackageFormatter(object): @rtype: tuple: (int, list) @return: int = an index for this list: - [" ", " ~", " -", "M ", "M~", "M-", "XX"] + [" ", " ~", " -", "M ", "M~", "M-", "??"] 0 = not masked 1 = keyword masked 2 = arch masked |