Bash-4.3 patch 6

diff --git a/jobs.c b/jobs.c
index 2452779ce7fbcc853cf04496b4d3ae9fc372629a..4982019072369ca06cdb20d4d8e4e15557567adf 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 ();
 

diff --git a/patchlevel.h b/patchlevel.h
index 11097c3504b8a552a585b9f43703d23be8ca6a66..7e887f6c1ceb60d55119a07f652cbcf9c8bad4fb 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 5
+#define PATCHLEVEL 6
 
 #endif /* _PATCHLEVEL_H_ */