From: Chet Ramey <chet.ramey@case.edu>
Date: Fri, 28 Mar 2014 15:53:02 +0000 (-0400)
Subject: Bash-4.3 patch 2
X-Git-Tag: upstream/4.3.25~23
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fbash.git;a=commitdiff_plain;h=7f89f4cd13da820eb657f2e08ba92f5445d130b5

Bash-4.3 patch 2
---

diff --git a/patchlevel.h b/patchlevel.h
index 15f3c51..1146585 100644
--- 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 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;