Bash-4.3 patch 6
authorChet Ramey <chet.ramey@case.edu>
Fri, 28 Mar 2014 15:54:05 +0000 (11:54 -0400)
committerChet Ramey <chet.ramey@case.edu>
Fri, 28 Mar 2014 15:54:05 +0000 (11:54 -0400)
jobs.c
patchlevel.h

diff --git a/jobs.c b/jobs.c
index 2452779..4982019 100644 (file)
--- 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 ();
 
index 11097c3..7e887f6 100644 (file)
@@ -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_ */