From: Bernhard Voelker <mail@bernhard-voelker.de>
Date: Thu, 1 Nov 2012 15:50:51 +0000 (+0100)
Subject: tests: fix syntax error in setuidgid_has_perm_
X-Git-Tag: v8.21~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad5eeacc6740fd98ebe641b6fa88ec4019295b4e;p=thirdparty%2Fcoreutils.git

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.
---

diff --git a/NEWS b/NEWS
index 3b40375c58..c824e41a1a 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 304b918469..e853b0a2f9 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:) ;;