Bash-4.3 patch 2

diff --git a/patchlevel.h b/patchlevel.h
index 15f3c51ca547c14d5c2295988f65302086527b65..1146585dad7aaed1b4af57e726f66ed920c87698 100644 (file)
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
    regexp `^#define[   ]*PATCHLEVEL', since that's what support/mkversion.sh
    looks for to find the patch level (for the sccs version string). */
 
-#define PATCHLEVEL 1
+#define PATCHLEVEL 2
 
 #endif /* _PATCHLEVEL_H_ */

diff --git a/trap.c b/trap.c
index 15d3fc81cff58e258a5055d664c4eb9ea722c8f1..edce31ab9ba90926abe03f88920d5f20ac526a88 100644 (file)
--- 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;