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

3 files changed, 15 insertions, 9 deletions

diff --git a/man/equery.1 b/man/equery.1
index ec07c0d..bc80c2d 100644
--- a/man/equery.1
+++ b/man/equery.1
@@ -299,7 +299,7 @@ Include all packages from the Portage tree in the search path. Use this option t
 equery hasuse -pI perl
 .EE
 .br
-View all Gentoo packages that have the "perl" USE flag, excluding installed packages.
+View all Gentoo packages that have the "perl" USE flag, exluding installed packages.
 .EX
 .HP
 USE="perl"; for PKG in $(equery -q hasuse $USE); do echo $PKG: $(equery -q uses $PKG |grep $USE); done
@@ -342,7 +342,7 @@ Include all packages from the Portage tree in the search path. Use this option t
 .EX
 $ equery list binutils
  * Searching for binutils ...
- [I--] [XX] sys-devel/binutils-2.18-r1:i686-pc-linux-gnu-2.18
+ [I--] [??] sys-devel/binutils-2.18-r1:i686-pc-linux-gnu-2.18
  [IP-] [ ~] sys-devel/binutils-2.19.1-r1:i686-pc-linux-gnu-2.19.1
 .EE
 .HP
@@ -350,9 +350,9 @@ Location field (\fB[IPO-]\fP):
 .br
 The first field shows the location and install status of the package. It consists of three letters in square brackets. \fBI\fP indicates the package is currently installed. \fBP\fP indicates the package is available in the Portage tree. \fBO\fP indicates the package is available in at least one overlay. \fB-\fP is a place holder and has no meaning. \fB[I-O]\fP would mean that the package is installed and available from an overlay, but not available from the Portage tree.
 .HP
-Mask-status field (\fB[ ~M-XX]\fP):
+Mask-status field (\fB[ ~M-??]\fP):
 .br
-The second field shows the mask status of the package. Empty brackets indicate that the package is unmasked. A \fB~\fP means the package is masked by keyword, e.g., you are running a stable system and the package is marked testing). \fBM\fP means hard masked, e.g., the package maintainer has determined the package is unfit for widespread usage. \fB-\fP means arch masked, e.g., you are running an amd64 system, but this package only works on x86. Lastly, \fBXX\fP only occurs when the location field is \fB[I--]\fP. Together, they indicate that the package was installed from the Portage tree or an overlay, but has since been removed from that tree; therefore \fBequery\fP can not determine a mask status for it.
+The second field shows the mask status of the package. Empty brackets indicate that the package is unmasked. A \fB~\fP means the package is masked by keyword, e.g., you are running a stable system and the package is marked testing). \fBM\fP means hard masked, e.g., the package maintainer has determined the package is unfit for widespread usage. \fB-\fP means arch masked, e.g., you are running an amd64 system, but this package only works on x86. Lastly, \fB??\fP only occurs when the location field is \fB[I--]\fP. Together, they indicate that the package was installed from the Portage tree or an overlay, but has since been removed from that tree; therefore \fBequery\fP can not determine a mask status for it.
 .HP
 Package name:
 .br
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