mirror of
https://github.com/flatcar/scripts.git
synced 2025-11-24 12:01:59 +01:00
sys-apps/findutils: Sync with Gentoo
It's from Gentoo commit b5aadcfe0518d3c2d1516ab577929d597583aded.
This commit is contained in:
parent
e795a672f0
commit
6cdb6e6680
@ -0,0 +1,41 @@
|
||||
https://git.savannah.gnu.org/cgit/findutils.git/commit/?id=a5b2e20d8
|
||||
|
||||
From a5b2e20d8f93e96817e00af6dd0a4c914580e8a2 Mon Sep 17 00:00:00 2001
|
||||
From: Bernhard Voelker <mail@bernhard-voelker.de>
|
||||
Date: Tue, 23 May 2023 01:57:47 +0200
|
||||
Subject: tests: fix FP in xargs test when /bin/sh is dash
|
||||
|
||||
Dash as /bin/sh apparently does not know $'\n' syntax.
|
||||
|
||||
* tests/xargs/verbose-quote.sh: Define NL variable for newline character;
|
||||
change from $'\n' syntax to the above variable when generating input
|
||||
for xargs.
|
||||
|
||||
Fixes https://sv.gnu.org/bugs/?63934
|
||||
---
|
||||
tests/xargs/verbose-quote.sh | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/xargs/verbose-quote.sh b/tests/xargs/verbose-quote.sh
|
||||
index d25f7db..e3607ce 100755
|
||||
--- a/tests/xargs/verbose-quote.sh
|
||||
+++ b/tests/xargs/verbose-quote.sh
|
||||
@@ -28,12 +28,15 @@ printf "%s\n" \
|
||||
|| framework_failure_
|
||||
|
||||
# Run xargs with -t for verious commands which require quoting.
|
||||
+# (Use NL because dash as /bin/sh does not know $'\n' syntax.)
|
||||
+nl='
|
||||
+'
|
||||
printf '%s\0' \
|
||||
000 \
|
||||
'10 0' \
|
||||
'20"0' \
|
||||
"30'0" \
|
||||
- 40$'\n'0 \
|
||||
+ "40${nl}0" \
|
||||
| xargs -0t '-I{}' './my command' 'hel lo' '{}' world > out 2> err \
|
||||
|| fail=1
|
||||
|
||||
--
|
||||
cgit v1.1
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{9..11} )
|
||||
PYTHON_COMPAT=( python3_{10..11} )
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/findutils.asc
|
||||
inherit flag-o-matic python-any-r1 verify-sig
|
||||
|
||||
@ -32,6 +32,10 @@ BDEPEND="
|
||||
verify-sig? ( sec-keys/openpgp-keys-findutils )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-dash-tests.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
use test && python-any-r1_pkg_setup
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user