1 |
Author: zmedico |
2 |
Date: 2008-03-28 13:07:53 +0000 (Fri, 28 Mar 2008) |
3 |
New Revision: 9578 |
4 |
|
5 |
Modified: |
6 |
main/branches/2.1.2/bin/ebuild.sh |
7 |
Log: |
8 |
Bug #213698 - Make FEAUTURES=keepwork and keeptemp preserve ${T}/environment |
9 |
since it may contain essential state. (trunk r9526) |
10 |
|
11 |
|
12 |
Modified: main/branches/2.1.2/bin/ebuild.sh |
13 |
=================================================================== |
14 |
--- main/branches/2.1.2/bin/ebuild.sh 2008-03-28 13:07:05 UTC (rev 9577) |
15 |
+++ main/branches/2.1.2/bin/ebuild.sh 2008-03-28 13:07:53 UTC (rev 9578) |
16 |
@@ -650,11 +650,9 @@ |
17 |
if [ "${newstuff}" == "yes" ]; then |
18 |
# We don't necessarily have privileges to do a full dyn_clean here. |
19 |
rm -rf "${WORKDIR}" |
20 |
- if [ -d "${T}" ] && ! hasq keeptemp ${FEATURES} ; then |
21 |
+ if [ -d "${T}" ] && \ |
22 |
+ ! hasq keeptemp $FEATURES && ! hasq keepwork $FEATURES ; then |
23 |
rm -rf "${T}" && mkdir "${T}" |
24 |
- else |
25 |
- [ -e "${T}/environment" ] && \ |
26 |
- mv "${T}/environment" "${T}/environment.keeptemp" |
27 |
fi |
28 |
fi |
29 |
if [ -e "${WORKDIR}" ]; then |
30 |
@@ -692,10 +690,8 @@ |
31 |
|
32 |
rm -rf "${PORTAGE_BUILDDIR}/image" "${PORTAGE_BUILDDIR}/homedir" |
33 |
|
34 |
- if ! hasq keeptemp $FEATURES; then |
35 |
+ if ! hasq keeptemp $FEATURES && ! hasq keepwork $FEATURES ; then |
36 |
rm -rf "${T}" |
37 |
- else |
38 |
- [ -e "${T}/environment" ] && mv "${T}/environment" "${T}/environment.keeptemp" |
39 |
fi |
40 |
|
41 |
if ! hasq keepwork $FEATURES; then |
42 |
|
43 |
-- |
44 |
gentoo-commits@l.g.o mailing list |