From 70bf95f5bdb143f51ad962f8c7f7c841be3dab8e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 10 Jun 2011 05:21:06 -0700 Subject: bintree: handle pkgindex CHOST header like REPO This allows an existing CHOST header entry to properly override our default. --- pym/portage/dbapi/bintree.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pym') 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" : "", } -- cgit v1.2.3-1-g7c22