From 7f89f4cd13da820eb657f2e08ba92f5445d130b5 Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Fri, 28 Mar 2014 11:53:02 -0400 Subject: Bash-4.3 patch 2 --- trap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'trap.c') diff --git a/trap.c b/trap.c index 15d3fc8..edce31a 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; -- cgit v1.2.3