summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Voelker <mail@bernhard-voelker.de>2012-11-01 16:50:51 +0100
committerPádraig Brady <P@draigBrady.com>2012-11-01 17:37:58 +0000
commitad5eeacc6740fd98ebe641b6fa88ec4019295b4e (patch)
tree73bd9eeab63c18f485e5a2c0c42852c788c2af9c
parent1cace4a832fe57a45d87b0579607c4d236cce457 (diff)
downloadcoreutils-ad5eeacc6740fd98ebe641b6fa88ec4019295b4e.tar.xz
tests: fix syntax error in setuidgid_has_perm_
An invalid sed expression lead to the following error: + sed -n 'ls/.* //p' sed: -e expression #1, char 2: extra characters after command Use "one" instead of "el". Bug introduced in v8.19-111-g51a4b04. * init.cfg (setuidgid_has_perm_): s/ls/1s/. * NEWS (Build-related): Mention the fix.
-rw-r--r--NEWS5
-rw-r--r--init.cfg2
2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 3b40375c5..c824e41a1 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,11 @@ GNU coreutils NEWS -*- outline -*-
build failure when building from modified sources, as is common practice
for a patched distribution package.
+ The check in the root-only tests to test whether our dummy user,
+ $NON_ROOT_USERNAME, is able to run binaries from the build directory
+ failed. As a result, these tests have been skipped unnecessarily.
+ [bug introduced in coreutils-8.20]
+
* Noteworthy changes in release 8.20 (2012-10-23) [stable]
diff --git a/init.cfg b/init.cfg
index 304b91846..e853b0a2f 100644
--- a/init.cfg
+++ b/init.cfg
@@ -352,7 +352,7 @@ setuidgid_has_perm_()
{
local rm_version=$(
setuidgid $NON_ROOT_USERNAME env PATH="$PATH" rm --version |
- sed -n 'ls/.* //p'
+ sed -n '1s/.* //p'
)
case ":$rm_version:" in
:$PACKAGE_VERSION:) ;;