diff options
| -rw-r--r-- | trunk/ChangeLog | 4 | ||||
| -rwxr-xr-x | trunk/src/equery/equery | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/trunk/ChangeLog b/trunk/ChangeLog index 105cdb6..f9f6f3c 100644 --- a/trunk/ChangeLog +++ b/trunk/ChangeLog @@ -1,3 +1,7 @@ +2007-09-18: Paul Varner <fuzzyray@gentoo.org> + * equery: Apply patch from Carlo Marcelo Arenas Belon to fix incorrect + display of masking status in list command. (Bug #188678) + 2007-09-12: Paul Varner <fuzzyray@gentoo.org> * eclean: Fix processing of the long arguments to work correctly. (Bug #192345) diff --git a/trunk/src/equery/equery b/trunk/src/equery/equery index f73f724..0639cc2 100755 --- a/trunk/src/equery/equery +++ b/trunk/src/equery/equery @@ -1417,10 +1417,11 @@ class CmdListPackages(Command): # if "package.mask" in maskreasons: pkgmask = pkgmask + 3 keywords = pkg.get_env_var("KEYWORDS").split() - if "~" + gentoolkit.settings["ARCH"] in keywords: - pkgmask = pkgmask + 1 - elif "-*" in keywords or "-" + gentoolkit.settings["ARCH"] in keywords: - pkgmask = pkgmask + 2 + if gentoolkit.settings["ARCH"] not in keywords: + if "~" + gentoolkit.settings["ARCH"] in keywords: + pkgmask = pkgmask + 1 + elif "-" + gentoolkit.settings["ARCH"] in keywords or "-*" in keywords: + pkgmask = pkgmask + 2 return pkgmask def _generic_print(self, header, exclude, matches, rx, status): |