From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 10 Apr 2008 20:46:56 +0000 (-0000)
Subject: Make the CHOST visibility check tolerant of missing CHOST metadata.
X-Git-Tag: v2.1.5~203
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e8da72a911815b217148b9034d56ba43dca457f4;p=portage.git

Make the CHOST visibility check tolerant of missing CHOST metadata.
(trunk r9817)

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

diff --git a/bin/emerge b/bin/emerge
index 26061908c..1e445aed7 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1257,9 +1257,10 @@ def visible(pkgsettings, pkg):
 	"""
 	if not pkg.metadata["SLOT"]:
 		return False
-	if pkg.built and not pkg.installed and \
-		pkg.metadata["CHOST"] != pkgsettings["CHOST"]:
-		return False
+	if pkg.built and not pkg.installed:
+		pkg_chost = pkg.metadata.get("CHOST")
+		if pkg_chost and pkg_chost != pkgsettings["CHOST"]:
+			return False
 	if not portage.eapi_is_supported(pkg.metadata["EAPI"]):
 		return False
 	if not pkg.installed and \
@@ -1277,10 +1278,11 @@ def get_masking_status(pkg, pkgsettings, root_config):
 		pkg, settings=pkgsettings,
 		portdb=root_config.trees["porttree"].dbapi)
 
-	if pkg.built and not pkg.installed and \
-		pkg.metadata["CHOST"] != root_config.settings["CHOST"]:
-		mreasons.append("CHOST: %s" % \
-			pkg.metadata["CHOST"])
+	if pkg.built and not pkg.installed:
+		pkg_chost = pkg.metadata.get("CHOST")
+		if pkg_chost and pkg_chost != pkgsettings["CHOST"]:
+			mreasons.append("CHOST: %s" % \
+				pkg.metadata["CHOST"])
 
 	if not pkg.metadata["SLOT"]:
 		mreasons.append("invalid: SLOT is undefined")