summaryrefslogtreecommitdiff
path: root/trap.c
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2014-03-28 11:53:02 -0400
committerChet Ramey <chet.ramey@case.edu>2014-03-28 11:53:02 -0400
commit7f89f4cd13da820eb657f2e08ba92f5445d130b5 (patch)
tree752180a3c8dab02aef2461c6508949cdea337282 /trap.c
parentf5c8237d0dfdd8a68f5ec97cff6547033681d695 (diff)
downloadbash-7f89f4cd13da820eb657f2e08ba92f5445d130b5.tar.gz
Bash-4.3 patch 2
Diffstat (limited to 'trap.c')
-rw-r--r--trap.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/trap.c b/trap.c
index 15d3fc81..edce31ab 100644
--- a/trap.c
+++ b/trap.c
@@ -920,7 +920,8 @@ _run_trap_internal (sig, tag)
subst_assign_varlist = 0;
#if defined (JOB_CONTROL)
- save_pipeline (1); /* XXX only provides one save level */
+ if (sig != DEBUG_TRAP) /* run_debug_trap does this */
+ save_pipeline (1); /* XXX only provides one save level */
#endif
/* If we're in a function, make sure return longjmps come here, too. */
@@ -940,7 +941,8 @@ _run_trap_internal (sig, tag)
trap_exit_value = last_command_exit_value;
#if defined (JOB_CONTROL)
- restore_pipeline (1);
+ if (sig != DEBUG_TRAP) /* run_debug_trap does this */
+ restore_pipeline (1);
#endif
subst_assign_varlist = save_subst_varlist;