diff options
author | Zac Medico <zmedico@gentoo.org> | 2008-03-28 13:07:53 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2008-03-28 13:07:53 +0000 |
commit | 9b6ab32fd773f59917688b75b2ea5da5db626602 (patch) | |
tree | d6a2de53a060e7551cd3808956752a82ae7c695e /bin | |
parent | c5934a389dd13397baa88781bdc1221accb1ad26 (diff) | |
download | portage-9b6ab32fd773f59917688b75b2ea5da5db626602.tar.gz portage-9b6ab32fd773f59917688b75b2ea5da5db626602.tar.bz2 portage-9b6ab32fd773f59917688b75b2ea5da5db626602.zip |
Bug #213698 - Make FEAUTURES=keepwork and keeptemp preserve ${T}/environment
since it may contain essential state. (trunk r9526)
svn path=/main/branches/2.1.2/; revision=9578
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 395510fb6..fb2e2a3a5 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 |