diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2014-03-28 11:53:02 -0400 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2014-03-28 11:53:02 -0400 |
| commit | 7f89f4cd13da820eb657f2e08ba92f5445d130b5 (patch) | |
| tree | 752180a3c8dab02aef2461c6508949cdea337282 | |
| parent | f5c8237d0dfdd8a68f5ec97cff6547033681d695 (diff) | |
| download | android_external_bash-7f89f4cd13da820eb657f2e08ba92f5445d130b5.tar.gz android_external_bash-7f89f4cd13da820eb657f2e08ba92f5445d130b5.tar.bz2 android_external_bash-7f89f4cd13da820eb657f2e08ba92f5445d130b5.zip | |
Bash-4.3 patch 2
| -rw-r--r-- | patchlevel.h | 2 | ||||
| -rw-r--r-- | trap.c | 6 |
2 files changed, 5 insertions, 3 deletions
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_ */ @@ -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; |