| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 06:55:20 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13452 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/bin/ebuild.sh |
| 7 |
main/branches/2.1.6/bin/isolated-functions.sh |
| 8 |
Log: |
| 9 |
Bug #264494 - In case the ebuild has enabled set -e during an ebuild phase, |
| 10 |
proactively call set +e inside qa_source(), qa_call(), and die(). (trunk r13273) |
| 11 |
|
| 12 |
Modified: main/branches/2.1.6/bin/ebuild.sh |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.6/bin/ebuild.sh 2009-04-30 06:55:08 UTC (rev 13451) |
| 15 |
+++ main/branches/2.1.6/bin/ebuild.sh 2009-04-30 06:55:20 UTC (rev 13452) |
| 16 |
@@ -35,6 +35,7 @@ |
| 17 |
local retval |
| 18 |
source "$@" |
| 19 |
retval=$? |
| 20 |
+ set +e |
| 21 |
[[ $shopts != $(shopt) ]] && |
| 22 |
eqawarn "QA Notice: Global shell options changed and were not restored while sourcing '$*'" |
| 23 |
[[ "$IFS" != "$OLDIFS" ]] && |
| 24 |
@@ -47,6 +48,7 @@ |
| 25 |
local retval |
| 26 |
"$@" |
| 27 |
retval=$? |
| 28 |
+ set +e |
| 29 |
[[ $shopts != $(shopt) ]] && |
| 30 |
eqawarn "QA Notice: Global shell options changed and were not restored while calling '$*'" |
| 31 |
[[ "$IFS" != "$OLDIFS" ]] && |
| 32 |
|
| 33 |
Modified: main/branches/2.1.6/bin/isolated-functions.sh |
| 34 |
=================================================================== |
| 35 |
--- main/branches/2.1.6/bin/isolated-functions.sh 2009-04-30 06:55:08 UTC (rev 13451) |
| 36 |
+++ main/branches/2.1.6/bin/isolated-functions.sh 2009-04-30 06:55:20 UTC (rev 13452) |
| 37 |
@@ -54,6 +54,7 @@ |
| 38 |
} |
| 39 |
|
| 40 |
die() { |
| 41 |
+ set +e |
| 42 |
if [ -n "${QA_INTERCEPTORS}" ] ; then |
| 43 |
# die was called from inside inherit. We need to clean up |
| 44 |
# QA_INTERCEPTORS since sed is called below. |
Archives