[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 fa7b540e2f4751d3585942b5f699d8c55aa17752
Author: Clint Adams <schizo at debian.org>
Date:   Wed Jun 29 15:21:26 2005 +0000

    patches from Yann Dirson
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-73

diff --git a/debian/changelog b/debian/changelog
index 14dbe6f..efd7ba8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ fakeroot (1.4) unstable; urgency=low
     POSIX-conformant shell rather than /bin/sh.  This is
     necessary because Solaris is still using a /bin/sh from
     the early Cretaceous period.  closes: #316070.
+  * Apply patches from Yann Dirson to make tests more portable
+    and to fix typo in --help output.  closes: #316048.
 
  -- Clint Adams <schizo at debian.org>  Wed, 29 Jun 2005 10:23:12 -0400
 
diff --git a/scripts/fakeroot.in b/scripts/fakeroot.in
index d9dc69b..84a2fb4 100755
--- a/scripts/fakeroot.in
+++ b/scripts/fakeroot.in
@@ -6,7 +6,7 @@
 usage () {
 cat - >&2 <<EOF
 fakeroot, create a fake root environment.
-   usage: fakeroot [-l|--lib fakerootlib] [-r|--faked fakedbin]
+   usage: fakeroot [-l|--lib fakerootlib] [-f|--faked fakedbin]
                    [-i file] [-s file] [-u|--unknown-is-real]
 		   [-b|--fd-base fd] [-h|--help] [-v|--version]
                    [--] [command]
diff --git a/test/compare-tar b/test/compare-tar
index 767022d..483a163 100755
--- a/test/compare-tar
+++ b/test/compare-tar
@@ -2,8 +2,8 @@
 set -e
 echo compare-tar:
 
-tar -tvzf $1 |perl -p -e 's/^((.*?)(\t+|\s\s+)\d+).*\s(\S+)$/$1 $4/' |sort > tmp-1
-tar -tvzf $2 |perl -p -e 's/^((.*?)(\t+|\s\s+)\d+).*\s(\S+)$/$1 $4/' |sort > tmp-2
+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
 
 diff -u tmp-1 tmp-2 > tmp-diff
 
diff --git a/test/t.tar b/test/t.tar
index 583242a..62c05eb 100755
--- a/test/t.tar
+++ b/test/t.tar
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-tdir=$(cd ..; pwd -P)
+tdir=`cd ..; pwd -P`
 
 ../scripts/fakeroot${tcp} -f ${tdir}/faked${tcp} -l ${tdir}/.libs/${libfakeroot} -- \
  ${srcdir}/tartest
diff --git a/test/tartest b/test/tartest
index f3f86a3..d0d2a12 100755
--- a/test/tartest
+++ b/test/tartest
@@ -1,8 +1,8 @@
-#!/bin/sh -x
+#!/bin/sh
 set -e
 echo tartest:
 TMP=./tmp
-SRCDIR=$(cd ${srcdir}; pwd -P)
+SRCDIR=`cd ${srcdir}; pwd -P`
 PATH=$PATH:/usr/bin/X11
 export PATH
 umask 022
@@ -31,7 +31,7 @@ done
 #do some mv/rm stuff. 
 #The "mv" part used to confuse fakeroot_0.0-6 
 #   (inodes weren't removed from cache)
-FILES=$(for f in $LIST; do for c in mv rm ; do echo $c.$f ; done ; done)
+FILES=`for f in $LIST; do for c in mv rm ; do echo $c.$f ; done ; done`
 touch $FILES
 chown daemon:sys $FILES
 for f in $LIST; do
@@ -63,7 +63,7 @@ cd ..
 rm -f tartest.tar.gz
 uudecode ${SRCDIR}/tartest.tar.gz.uue 
 
-tar -czf faketar.tar.gz tar
+tar -cf - tar | gzip -9 > faketar.tar.gz
 
 ${SRCDIR}/compare-tar tartest.tar.gz faketar.tar.gz 
  
@@ -74,8 +74,8 @@ ${SRCDIR}/compare-tar tartest.tar.gz faketar.tar.gz
 
 rm -rf tar
 
-tar -xzf tartest.tar.gz
-tar -czf tartest.test.tar.gz tar
+gzip -dc tartest.tar.gz | tar xf -
+tar cf - tar | gzip -9 >tartest.test.tar.gz
 
 ${SRCDIR}/compare-tar tartest.tar.gz tartest.test.tar.gz 
 

-- 
fakeroot