46 lines
1.1 KiB
Diff
46 lines
1.1 KiB
Diff
From ba970fdb2dcc627f2952d0bd3421abdcd9e8b85e Mon Sep 17 00:00:00 2001
|
|
From: Chet Ramey <chet.ramey@case.edu>
|
|
Date: Sat, 19 Dec 2020 14:27:54 -0500
|
|
Subject: [PATCH] Bash-5.1 patch 2: fix wait -n -p var with no jobs not leaving
|
|
var unset
|
|
|
|
---
|
|
builtins/wait.def | 6 +++---
|
|
patchlevel.h | 2 +-
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/builtins/wait.def b/builtins/wait.def
|
|
index 12260737..824c83fe 100644
|
|
--- a/builtins/wait.def
|
|
+++ b/builtins/wait.def
|
|
@@ -213,11 +213,11 @@ wait_builtin (list)
|
|
}
|
|
|
|
status = wait_for_any_job (wflags, &pstat);
|
|
- if (status < 0)
|
|
- status = 127;
|
|
-
|
|
if (vname && status >= 0)
|
|
bind_var_to_int (vname, pstat.pid);
|
|
+
|
|
+ if (status < 0)
|
|
+ status = 127;
|
|
if (list)
|
|
unset_waitlist ();
|
|
WAIT_RETURN (status);
|
|
diff --git a/patchlevel.h b/patchlevel.h
|
|
index d5b8c5af..8a183551 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_ */
|
|
--
|
|
2.27.0
|
|
|