diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-20 21:58:03 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-20 21:58:03 +0000 |
| commit | 87c0e3c842f3eeeb60cda62f92d19a52f5563a4d (patch) | |
| tree | 33c74511c49edb2cee57953773c3d4b108f7e9a4 /bin/ebuild.sh | |
| parent | c79fe82bf25399dd017116a3d8ddb6e0fc07ca0b (diff) | |
| download | portage-87c0e3c842f3eeeb60cda62f92d19a52f5563a4d.tar.gz portage-87c0e3c842f3eeeb60cda62f92d19a52f5563a4d.tar.bz2 portage-87c0e3c842f3eeeb60cda62f92d19a52f5563a4d.zip | |
Make diefunc() clean up QA_INTERCEPTORS in case it is
called from inherit() since sed called below. (trunk
r8490)
svn path=/main/branches/2.1.2/; revision=8553
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 8ede30a95..0a6694ce2 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -289,7 +289,12 @@ register_die_hook() { diefunc() { local funcname="$1" lineno="$2" exitcode="$3" shift 3 - + if [ -n "${QA_INTERCEPTORS}" ] ; then + # die was called from inside inherit. We need to clean up + # QA_INTERCEPTORS since sed is called below. + unset -f ${QA_INTERCEPTORS} + unset QA_INTERCEPTORS + fi local n filespacing=0 linespacing=0 # setup spacing to make output easier to read for ((n = ${#FUNCNAME[@]} - 1; n >= 0; --n)); do |