From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 6 Oct 2007 22:23:05 +0000 (-0000)
Subject: In PackageIndex.write(), skip writing the CHOST for a
X-Git-Tag: v2.2_pre1~695
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c269e7e72ed2fd38cbb2ac2666801dc3526a63b8;p=portage.git

In PackageIndex.write(), skip writing the CHOST for a
package entry if it's CHOST matches the header.

svn path=/main/trunk/; revision=7988
---

diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py
index 8107207c2..977693c6d 100644
--- a/pym/portage/getbinpkg.py
+++ b/pym/portage/getbinpkg.py
@@ -700,8 +700,11 @@ class PackageIndex(object):
 		keys = self.header.keys()
 		keys.sort()
 		writepkgindex(pkgfile, [(k, self.header[k]) for k in keys])
+		header_chost = self.header.get("CHOST")
 		for cpv in cpv_all:
 			metadata = self.packages[cpv].copy()
+			if metadata.get("CHOST") == header_chost:
+				del metadata["CHOST"]
 			if metadata.get("EAPI") == "0":
 				del metadata["EAPI"]
 			if metadata.get("SLOT") == "0":