From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 10 Jun 2011 12:21:06 +0000 (-0700)
Subject: bintree: handle pkgindex CHOST header like REPO
X-Git-Tag: v2.2.0_alpha40~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=70bf95f5bdb143f51ad962f8c7f7c841be3dab8e;p=portage.git

bintree: handle pkgindex CHOST header like REPO

This allows an existing CHOST header entry to properly override our
default.
---

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 756ea6711..7af152cd7 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -249,7 +249,7 @@ class binarytree(object):
 			self._pkgindex_header_keys = set([
 				"ACCEPT_KEYWORDS", "ACCEPT_LICENSE",
 				"ACCEPT_PROPERTIES", "CBUILD",
-				"CHOST", "CONFIG_PROTECT", "CONFIG_PROTECT_MASK", "FEATURES",
+				"CONFIG_PROTECT", "CONFIG_PROTECT_MASK", "FEATURES",
 				"GENTOO_MIRRORS", "INSTALL_MASK", "SYNC", "USE"])
 			self._pkgindex_default_pkg_data = {
 				"BUILD_TIME"         : "",
@@ -274,6 +274,7 @@ class binarytree(object):
 			# Populate the header with appropriate defaults.
 			self._pkgindex_default_header_data = {
 				"VERSION"      : str(self._pkgindex_version),
+				"CHOST"        : self.settings.get("CHOST", ""),
 				"repository"   : "",
 			}