aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-10 20:45:55 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-10 20:45:55 +0000
commit2b5b912430c88f9e8828b2789871bd9c99bf1596 (patch)
treef04eebc5f310808fe5e69eca8470c836ed01cb9f
parent48c8af8d496d66f6828c2b14483ac70ea3538e5f (diff)
downloadpaludis-2b5b912430c88f9e8828b2789871bd9c99bf1596.tar.gz
paludis-2b5b912430c88f9e8828b2789871bd9c99bf1596.tar.xz
Fix loading of multiline variables from environment
-rwxr-xr-xebuild/ebuild.bash5
1 files changed, 3 insertions, 2 deletions
diff --git a/ebuild/ebuild.bash b/ebuild/ebuild.bash
index fd8ba52..90c6711 100755
--- a/ebuild/ebuild.bash
+++ b/ebuild/ebuild.bash
@@ -164,7 +164,7 @@ ebuild_load_ebuild()
|| die "You need to create PALUDIS_TMPDIR (${PALUDIS_TMPDIR})."
local save_PALUDIS_EXTRA_DIE_MESSAGE="${PALUDIS_EXTRA_DIE_MESSAGE}"
- export PALUDIS_EXTRA_DIE_MESSAGE="
+ local real_PALUDIS_EXTRA_DIE_MESSAGE="
!!! Could not extract the saved environment file. This is usually
!!! caused by a broken environment.bz2 that was generated by an old
!!! Portage version. The file that needs repairing is:
@@ -174,6 +174,7 @@ ebuild_load_ebuild()
!!! should get an error that give you a rough idea of where the
!!! problem lies.
"
+ export PALUDIS_EXTRA_DIE_MESSAGE="${real_PALUDIS_EXTRA_DIE_MESSAGE}"
bunzip2 < "${PALUDIS_LOAD_ENVIRONMENT}" > ${PALUDIS_TMPDIR}/environment-${CATEGORY}-${PF} \
|| die "Can't extract ${PALUDIS_LOAD_ENVIRONMENT}"
@@ -194,7 +195,6 @@ ebuild_load_ebuild()
-e '/^\(declare \(-[^ ]\+ \)\?\)\?PALUDIS_EBUILD_DIR=/d' \
-e '/^\(declare \(-[^ ]\+ \)\?\)\?PALUDIS_COMMAND=/d' \
-e '/^\(declare \(-[^ ]\+ \)\?\)\?PALUDIS_HOME=/d' \
- -e '/^\(declare \(-[^ ]\+ \)\?\)\?PALUDIS_EXTRA_DIE_MESSAGE=/d' \
-e '/^\(declare \(-[^ ]\+ \)\?\)\?EBUILD_KILL_PID=/d' \
-e '/^\(declare \(-[^ ]\+ \)\?\)\?ROOT=/d' \
-e '/^\(declare \(-[^ ]\+ \)\?\)\?SANDBOX/d' \
@@ -204,6 +204,7 @@ ebuild_load_ebuild()
-e '/^\(declare \(-[^ ]\+ \)\?\)\?LD_/d' \
"${PALUDIS_TMPDIR}/environment-${CATEGORY}-${PF}"
+ export PALUDIS_EXTRA_DIE_MESSAGE="${real_PALUDIS_EXTRA_DIE_MESSAGE}"
echo source "${PALUDIS_TMPDIR}/environment-${CATEGORY}-${PF}" 1>&2
source "${PALUDIS_TMPDIR}/environment-${CATEGORY}-${PF}" \