mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 12:49:46 +00:00
bash: Fix file-substitution error-handling bug
This is part of a patch that's been upstream for a while but hasn't yet been released. The bug is causing some downstream difficulties, so a local patch to tide us over until the next release makes things a bit easier. (From OE-Core rev: 6a81ccc68f8389ca1c9c8eed009388045beea9e4) Signed-off-by: Zev Weiss <zev@bewilderbeest.net> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit bf384d6618780dea2df24adac88ba4364cb65b9b) Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
@@ -0,0 +1,34 @@
|
|||||||
|
From 59ddfda14e3c9aa6286bb4c4c0748f7c1324a65a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Chet Ramey <chet.ramey@case.edu>
|
||||||
|
Date: Fri, 7 Apr 2023 00:28:46 -0700
|
||||||
|
Subject: [PATCH] $(<nosuchfile) is no longer a fatal error with errexit
|
||||||
|
enabled
|
||||||
|
|
||||||
|
This is a trimmed-down version of a commit in the bash 'devel' branch
|
||||||
|
[1] that contains this fix as well as other unrelated ones.
|
||||||
|
|
||||||
|
[1] https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=ec9447ce9392a0f93d96789c3741285fede8a150
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
|
||||||
|
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
|
||||||
|
---
|
||||||
|
builtins/evalstring.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/builtins/evalstring.c b/builtins/evalstring.c
|
||||||
|
index df3dd68e2a7e..6612081cd646 100644
|
||||||
|
--- a/builtins/evalstring.c
|
||||||
|
+++ b/builtins/evalstring.c
|
||||||
|
@@ -753,7 +753,7 @@ open_redir_file (r, fnp)
|
||||||
|
fd = open(fn, O_RDONLY);
|
||||||
|
if (fd < 0)
|
||||||
|
{
|
||||||
|
- file_error (fn);
|
||||||
|
+ internal_error ("%s: %s", fn, strerror (errno));
|
||||||
|
free (fn);
|
||||||
|
if (fnp)
|
||||||
|
*fnp = 0;
|
||||||
|
--
|
||||||
|
2.40.0
|
||||||
|
|
||||||
@@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
|
|||||||
file://fix-run-builtins.patch \
|
file://fix-run-builtins.patch \
|
||||||
file://use_aclocal.patch \
|
file://use_aclocal.patch \
|
||||||
file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \
|
file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \
|
||||||
|
file://fix-filesubst-errexit.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[tarball.sha256sum] = "c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8"
|
SRC_URI[tarball.sha256sum] = "c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8"
|
||||||
|
|||||||
Reference in New Issue
Block a user