[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.2.2-29-g43ed8ff



The following commit has been merged in the master branch:
commit 1cd8370b12d7f3e766c3508f9c24d9ddb96c36c5
Author: Raphael Geissert <atomo64@gmail.com>
Date:   Fri Feb 6 18:13:13 2009 -0600

    Copy test suite files on checksum, not size
    
    Make rsync copy based on checksums, as there are cases, e.g. debian/compat
    files, where only one byte is changed, and since git doesn't preserve time
    stamps, it may lead to rsync not copying the necessary files causing the
    tests to fail.

diff --git a/t/runtests b/t/runtests
index 489326d..29bb372 100755
--- a/t/runtests
+++ b/t/runtests
@@ -306,21 +306,21 @@ sub test_package {
     if ($is_native) {
 	runsystem("cp", "-rp", "$tmpldir/$skel", $targetdir);
 	runsystem("rm", "-f", "$targetdir/debian/changelog");
-	runsystem("rsync", "-rp", "$origdir/debian/", "$targetdir/")
+	runsystem("rsync", "-rpc", "$origdir/debian/", "$targetdir/")
 	    if -d "$origdir/debian/";
     } else {
 	runsystem("cp", "-rp", "$tmpldir/${skel}.upstream", $targetdir);
 	runsystem("rm", "-f", "$targetdir/.dummy");
-	runsystem("rsync", "-rp", "$origdir/upstream/", "$targetdir/");
+	runsystem("rsync", "-rpc", "$origdir/upstream/", "$targetdir/");
 	if (-x "$origdir/pre_upstream") {
 	    print "running pre_upstream hook... " if $VERBOSE;
 	    runsystem("$origdir/pre_upstream", $targetdir);
 	}
 	runsystem("cd $RUNDIR && ".
 		  "tar czf ${pkg}_${orig_version}.orig.tar.gz $pkgdir");
-	runsystem("rsync", "-rp", "--exclude=debian/changelog",
+	runsystem("rsync", "-rpc", "--exclude=debian/changelog",
 		  "$tmpldir/$skel/", "$targetdir/");
-	runsystem("rsync", "-rp", "$origdir/debian/", "$targetdir/")
+	runsystem("rsync", "-rpc", "$origdir/debian/", "$targetdir/")
 	    if -d "$origdir/debian/";
     }
 

-- 
Debian package checker


Reply to: