diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-06-10 05:21:06 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-06-10 05:21:06 -0700 |
| commit | 70bf95f5bdb143f51ad962f8c7f7c841be3dab8e (patch) | |
| tree | 72c11ed438ab27686795779f1e2cc047e14f15ef | |
| parent | e445fcfd94100fcf83ad39454bfcdcb801a56721 (diff) | |
| download | portage-70bf95f5bdb143f51ad962f8c7f7c841be3dab8e.tar.gz portage-70bf95f5bdb143f51ad962f8c7f7c841be3dab8e.tar.bz2 portage-70bf95f5bdb143f51ad962f8c7f7c841be3dab8e.zip | |
bintree: handle pkgindex CHOST header like REPO
This allows an existing CHOST header entry to properly override our
default.
| -rw-r--r-- | pym/portage/dbapi/bintree.py | 3 |
1 files changed, 2 insertions, 1 deletions
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" : "", } |