]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
run-make-check.sh: reset trap after sourcing install-deps.sh
authorNathan Cutler <ncutler@suse.com>
Mon, 9 Jul 2018 10:40:46 +0000 (12:40 +0200)
committerJonathan Brielmaier <jbrielmaier@suse.de>
Mon, 19 Nov 2018 11:59:30 +0000 (12:59 +0100)
Since we source install-deps.sh, it replaces our trap with its own,
so we have to reinstate our trap after it finishes.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 458a0a6e6202ee9e976e19d7bc81652bf1b65c95)
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>
run-make-check.sh

index d72bf5cfdcba5d6cc23808503bd083f0b3b9ad45..256df5e5ee8cc465ca852c3f2d9520aeff510c39 100755 (executable)
@@ -84,6 +84,7 @@ function run() {
 
     if test -f ./install-deps.sh ; then
        $DRY_RUN source ./install-deps.sh || return 1
+        trap clean_up_after_myself EXIT
     fi
 
     # Init defaults after deps are installed. get_processors() depends on coreutils nproc.