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 8107207c21267a37949228b4eb7fab6633485b7e..977693c6defe675a7ce12845656903ef14ec54fd 100644 (file)
--- 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":