[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. 04dab641455927d5062151311f4cb4c128aa6392

Clint Adams clint at debian.org
Sun Apr 22 02:15:21 UTC 2012


The following commit has been merged in the upstream branch:
commit 74539b9b194c60a1949d529e77846b08648326c7
Author: Mikhail Gusarov <mikhail.gusarov at cfengine.com>
Date:   Tue Apr 10 15:39:23 2012 +0200

    Solaris' tar vf is unable to read "is directory" flag from test archives
    
    So skip the first column of tar output, it is not interesting anyway.

diff --git a/test/compare-tar b/test/compare-tar
index a524dc9..c76a1b0 100755
--- a/test/compare-tar
+++ b/test/compare-tar
@@ -17,8 +17,8 @@ esac
 set -e
 echo compare-tar:
 
-gzip -dc $1 | tar -tvf - |awk '{print $1, $2, $3, $NF}' |sed -e "s/$ROOTGROUP/root/" |sort > tmp-1
-gzip -dc $2 | tar -tvf - |awk '{print $1, $2, $3, $NF}' |sed -e "s/$ROOTGROUP/root/" |sort > tmp-2
+gzip -dc $1 | tar -tvf - |awk '{print $1, $2, $3, $NF}' |sed -e "s/$ROOTGROUP/root/" |cut -c2- |sort > tmp-1
+gzip -dc $2 | tar -tvf - |awk '{print $1, $2, $3, $NF}' |sed -e "s/$ROOTGROUP/root/" |cut -c2- |sort > tmp-2
 
 diff tmp-1 tmp-2 > tmp-diff || true
 

-- 
fakeroot



More information about the Fakeroot-commits mailing list