This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch master
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=7964e3c77df6f404dbed47703e0fdd1ddb417552

commit 7964e3c77df6f404dbed47703e0fdd1ddb417552
Author: Guillem Jover <[email protected]>
AuthorDate: Tue Nov 6 03:11:58 2018 +0100

    t-func: Stop requiring (pseudo-)root
    
    Pass --root-owner-group to dpkg-deb, which was the only command needing
    (pseudo-)root.
---
 debian/changelog     |  2 ++
 t-func/atlocal.in    | 10 ----------
 t-func/deb-format.at |  2 +-
 t-func/deb-split.at  |  2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1f9a314ee..c23551c08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ dpkg (1.19.6) UNRELEASED; urgency=medium
       vendor-specific patch series files.
     - Add Breaks on lsb-base due to start-stop-daemon exposing breakage in
       the killproc function from /lib/lsb/init-functions. Closes: #923861
+  * Test suite:
+    - Stop requiring (pseudo-)root in the functional test suite.
 
   [ Updated scripts translations ]
   * German (Helge Kreutzmann).
diff --git a/t-func/atlocal.in b/t-func/atlocal.in
index 683249c85..4182508a4 100644
--- a/t-func/atlocal.in
+++ b/t-func/atlocal.in
@@ -22,14 +22,4 @@ unset BZIP
 unset XZ_OPT
 unset XZ_DEFAULTS
 
-if [ "$(id -u)" = 0 ]; then
-  ASROOT=
-elif which fakeroot >/dev/null; then
-  ASROOT=fakeroot
-else
-  echo "skip: needs to run as root(ish)" >&2
-  exit 0
-fi
-export ASROOT
-
 TESTDATA="@abs_top_srcdir@/t-func"
diff --git a/t-func/deb-format.at b/t-func/deb-format.at
index cdfc648a8..956100ce9 100644
--- a/t-func/deb-format.at
+++ b/t-func/deb-format.at
@@ -18,7 +18,7 @@ AT_CHECK([
 mv pkg-deb-format pkg-templ
 chmod -R u+w pkg-templ
 find pkg-templ | xargs touch -t 197001010100.00
-$ASROOT dpkg-deb --uniform-compression -Znone -b pkg-templ >/dev/null
+dpkg-deb --uniform-compression --root-owner-group -Znone -b pkg-templ 
>/dev/null
 
 # Extract the base members
 ar x pkg-templ.deb
diff --git a/t-func/deb-split.at b/t-func/deb-split.at
index fe8f676a7..55a123cc0 100644
--- a/t-func/deb-split.at
+++ b/t-func/deb-split.at
@@ -18,7 +18,7 @@ chmod -R u+w pkg-split
 # does check print error conditions, so we ignore its error message here.
 yes 2>/dev/null | dd of=pkg-split/data-file bs=1024 count=1024 status=none
 find pkg-split | xargs touch -t 197001010100.00
-$ASROOT dpkg-deb -b -Znone pkg-split >/dev/null
+dpkg-deb --root-owner-group -Znone -b pkg-split >/dev/null
 ])
 
 AT_CHECK([

-- 
Dpkg.Org's dpkg

Reply via email to