This might help to locate a failing command which causes makepkg to
abort.

Signed-off-by: Florian Pritz <[email protected]>
---
This is a request for comments and not a final patch. It's only been tested 
shortly.
I just want to know if people like the idea.

 scripts/makepkg.sh.in |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 6304a25..409c4cc 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -851,6 +851,7 @@ extract_sources() {
 }
 
 error_function() {
+       set +x
        if [[ -p $logpipe ]]; then
                rm "$logpipe"
        fi
@@ -912,7 +913,9 @@ run_function() {
 
                restoretrap=$(trap -p ERR)
                trap 'error_function $pkgfunc' ERR
+               set -x
                $pkgfunc &>"$logpipe"
+               set +x
                eval $restoretrap
 
                wait $teepid
@@ -920,7 +923,9 @@ run_function() {
        else
                restoretrap=$(trap -p ERR)
                trap 'error_function $pkgfunc' ERR
+               set -x
                $pkgfunc 2>&1
+               set +x
                eval $restoretrap
        fi
        # reset our shell options
-- 
1.7.6.1

Reply via email to