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

Bash-4.3 patch 6
---

diff --git a/jobs.c b/jobs.c
index 2452779..4982019 100644
--- a/jobs.c
+++ b/jobs.c
@@ -4374,7 +4374,7 @@ without_job_control ()
 void
 end_job_control ()
 {
-  if (interactive_shell)		/* XXX - should it be interactive? */
+  if (interactive_shell || job_control)		/* XXX - should it be just job_control? */
     {
       terminate_stopped_jobs ();
 
diff --git a/patchlevel.h b/patchlevel.h
index 11097c3..7e887f6 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 5
+#define PATCHLEVEL 6
 
 #endif /* _PATCHLEVEL_H_ */