diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2014-03-28 11:54:05 -0400 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2014-03-28 11:54:05 -0400 |
| commit | 22205f43abedd7b0dbb553e5449a321d3669e881 (patch) | |
| tree | 998e4171372e97e282c14f3aeb1a120a5d5694bc | |
| parent | bc63a081829cb10b36a173907ed02e3c2374cd4b (diff) | |
| download | android_external_bash-22205f43abedd7b0dbb553e5449a321d3669e881.tar.gz android_external_bash-22205f43abedd7b0dbb553e5449a321d3669e881.tar.bz2 android_external_bash-22205f43abedd7b0dbb553e5449a321d3669e881.zip | |
Bash-4.3 patch 6
| -rw-r--r-- | jobs.c | 2 | ||||
| -rw-r--r-- | patchlevel.h | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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_ */ |