From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 10 Feb 2008 03:16:42 +0000 (-0000)
Subject: Fix CHOST masking logic wrt installed packages so that it's consistent
X-Git-Tag: v2.1.4.4~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=01dd4040e25e5554184af5c3068e6af5256ea964;p=portage.git

Fix CHOST masking logic wrt installed packages so that it's consistent
between visible() and get_masking_status(). (trunk r9324)

svn path=/main/branches/2.1.2/; revision=9325
---

diff --git a/bin/emerge b/bin/emerge
index 12e756357..51b1a56df 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1153,7 +1153,7 @@ def get_masking_status(pkg, pkgsettings, root_config):
 		pkg.cpv, metadata=pkg.metadata, settings=pkgsettings,
 		portdb=root_config.trees["porttree"].dbapi)
 
-	if pkg.built and \
+	if pkg.built and not pkg.installed and \
 		pkg.metadata["CHOST"] != root_config.settings["CHOST"]:
 		mreasons.append("CHOST: %s" % \
 			pkg.metadata["CHOST"])