diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-03-28 04:55:41 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-03-28 04:55:41 +0000 |
| commit | 6d068a8c3f86ac1550be649f6f958adeff8e3f23 (patch) | |
| tree | c06ea7b3e57511d1e57b3048b2dcb854cb18f12f /bin | |
| parent | 52c5df5982624e32638af732a600516ce82ac979 (diff) | |
| download | portage-6d068a8c3f86ac1550be649f6f958adeff8e3f23.tar.gz portage-6d068a8c3f86ac1550be649f6f958adeff8e3f23.tar.bz2 portage-6d068a8c3f86ac1550be649f6f958adeff8e3f23.zip | |
Bug #213698 - Make FEAUTURES=keepwork and keeptemp preserve ${T}/environment
since it may contain essential state.
svn path=/main/trunk/; revision=9526
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index b522f8db0..33c6d12c3 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -650,11 +650,9 @@ dyn_unpack() { if [ "${newstuff}" == "yes" ]; then # We don't necessarily have privileges to do a full dyn_clean here. rm -rf "${WORKDIR}" - if [ -d "${T}" ] && ! hasq keeptemp ${FEATURES} ; then + if [ -d "${T}" ] && \ + ! hasq keeptemp $FEATURES && ! hasq keepwork $FEATURES ; then rm -rf "${T}" && mkdir "${T}" - else - [ -e "${T}/environment" ] && \ - mv "${T}/environment" "${T}/environment.keeptemp" fi fi if [ -e "${WORKDIR}" ]; then @@ -692,10 +690,8 @@ dyn_clean() { rm -rf "${PORTAGE_BUILDDIR}/image" "${PORTAGE_BUILDDIR}/homedir" - if ! hasq keeptemp $FEATURES; then + if ! hasq keeptemp $FEATURES && ! hasq keepwork $FEATURES ; then rm -rf "${T}" - else - [ -e "${T}/environment" ] && mv "${T}/environment" "${T}/environment.keeptemp" fi if ! hasq keepwork $FEATURES; then |