Browse code

Merge "Fix exit_trap() error if no child processes"

Jenkins authored on 2014/02/28 10:50:06
Showing 1 changed files
... ...
@@ -591,8 +591,11 @@ fi
591 591
 trap exit_trap EXIT
592 592
 function exit_trap {
593 593
     local r=$?
594
-    echo "exit_trap called, cleaning up child processes"
595
-    kill 2>&1 $(jobs -p)
594
+    jobs=$(jobs -p)
595
+    if [[ -n $jobs ]]; then
596
+        echo "exit_trap: cleaning up child processes"
597
+        kill 2>&1 $jobs
598
+    fi
596 599
     exit $r
597 600
 }
598 601