aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-02-23 03:00:55 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-02-23 03:00:55 +0000
commit62cf2bb20465e265b7e714b14cabbf58a26ac35b (patch)
tree41d7d63a7e93dafd829d881c8d02a6a5045f6af4
parent8bcd390392cba5b58e21d71686933823d5c62054 (diff)
downloadpaludis-62cf2bb20465e265b7e714b14cabbf58a26ac35b.tar.gz
paludis-62cf2bb20465e265b7e714b14cabbf58a26ac35b.tar.xz
Reallow CONFIG_PROTECT in bashrc
-rwxr-xr-xpaludis/repositories/gentoo/ebuild/ebuild.bash11
1 files changed, 8 insertions, 3 deletions
diff --git a/paludis/repositories/gentoo/ebuild/ebuild.bash b/paludis/repositories/gentoo/ebuild/ebuild.bash
index d051506..94c8a2e 100755
--- a/paludis/repositories/gentoo/ebuild/ebuild.bash
+++ b/paludis/repositories/gentoo/ebuild/ebuild.bash
@@ -99,9 +99,10 @@ ebuild_source_profile()
export CONFIG_PROTECT="${PALUDIS_CONFIG_PROTECT}"
export CONFIG_PROTECT_MASK="${PALUDIS_CONFIG_PROTECT_MASK}"
-save_vars="USE USE_EXPAND USE_EXPAND_HIDDEN ${USE_EXPAND} CONFIG_PROTECT CONFIG_PROTECT_MASK"
+save_vars="USE USE_EXPAND USE_EXPAND_HIDDEN ${USE_EXPAND}"
+save_base_vars="CONFIG_PROTECT CONFIG_PROTECT_MASK"
-for var in ${save_vars} ${default_save_vars} ; do
+for var in ${save_vars} ${default_save_vars} ${save_base_vars} ; do
ebuild_notice "debug" "Saving ${var}=${!var}"
eval "export save_var_${var}='${!var}'"
done
@@ -114,7 +115,7 @@ elif [[ -n "${PALUDIS_PROFILE_DIR}" ]] ; then
ebuild_source_profile $(canonicalise "${PALUDIS_PROFILE_DIR}")
fi
-unset ${save_vars}
+unset ${save_vars} ${save_base_vars}
for f in ${PALUDIS_BASHRC_FILES} ; do
if [[ -f ${f} ]] ; then
@@ -135,6 +136,10 @@ for var in ${save_vars} ; do
eval "export ${var}=\${save_var_${var}}"
done
+for var in ${save_base_vars} ; do
+ eval "export ${var}=\"\${save_var_${var}} \$$(echo ${var})\""
+done
+
[[ -z "${CBUILD}" ]] && export CBUILD="${CHOST}"
ebuild_scrub_environment()