[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a

[Clint Adams]

The following commit has been merged in the upstream branch:
commit 570a5fbe4586b91c30255d7943121b5107398917
Author: Clint Adams <schizo at debian.org>
Date:   Mon Jan 21 22:21:06 2008 +0000

    Apply patch from Andrew Benham to make compare-tar test more portable.
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-159

diff --git a/debian/changelog b/debian/changelog
index 193abe2..19cd607 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ fakeroot (1.9.1) unstable; urgency=low
 
   * Apply patch from Andrew Benham to handle padding under Sun Studio
     on Solaris.
+  * Apply patch from Andrew Benham to make compare-tar test more
+    portable.
 
  -- Clint Adams <schizo at debian.org>  Mon, 21 Jan 2008 17:16:22 -0500
 
diff --git a/test/compare-tar b/test/compare-tar
index 483a163..d764705 100755
--- a/test/compare-tar
+++ b/test/compare-tar
@@ -2,10 +2,10 @@
 set -e
 echo compare-tar:
 
-gzip -dc $1 | tar -tvf - |perl -p -e 's/^((.*?)(\t+|\s\s+)\d+).*\s(\S+)$/$1 $4/' |sort > tmp-1
-gzip -dc $2 | tar -tvf - |perl -p -e 's/^((.*?)(\t+|\s\s+)\d+).*\s(\S+)$/$1 $4/' |sort > tmp-2
+gzip -dc $1 | tar -tvf - |awk '{print $1, $2, $3, $NF}' |sort > tmp-1
+gzip -dc $2 | tar -tvf - |awk '{print $1, $2, $3, $NF}' |sort > tmp-2
 
-diff -u tmp-1 tmp-2 > tmp-diff
+diff tmp-1 tmp-2 > tmp-diff || true
 
 if test -s tmp-diff; then
   echo tar files differ:

-- 
fakeroot