File pristine-tar-xdelta1.patch of Package pristine-tar

Overview Repositories Revisions Requests Users Attributes Meta

File pristine-tar-xdelta1.patch of Package pristine-tar

--- a/pristine-tar
+++ b/pristine-tar
@@ -391,7 +391,7 @@
 	my $ok;
 	foreach my $variant (@try) {
 		my $recreatetarball=$variant->();
-		my $ret=try_doit("xdelta", "patch", $delta->{delta}, $recreatetarball, $out);
+		my $ret=try_doit("xdelta1", "patch", $delta->{delta}, $recreatetarball, $out);
 		if ($ret == 0) {
 			$ok=1;
 			last;
@@ -503,10 +503,10 @@
 	}
 
 	$delta{delta}="$tempdir/delta";
-	my $ret=system("xdelta delta -0 --pristine $recreatetarball $tarball $delta{delta}") >> 8;
+	my $ret=system("xdelta1 delta -0 --pristine $recreatetarball $tarball $delta{delta}") >> 8;
 	# xdelta exits 1 on success if there were differences
 	if ($ret != 1 && $ret != 0) {
-		error "xdelta failed with return code $ret";
+		error "xdelta1 failed with return code $ret";
 	}
 
 	if (-s $delta{delta} >= -s $tarball) {
--- a/pristine-gz
+++ b/pristine-gz
@@ -234,7 +234,7 @@
 		else {
 			# generate a binary delta and see if this is the
 			# best variant so far
-			my $ret=system("xdelta delta -0 --pristine $tempout $orig $tempdir/tmpdelta 2>/dev/null") >> 8;
+			my $ret=system("xdelta1 delta -0 --pristine $tempout $orig $tempdir/tmpdelta 2>/dev/null") >> 8;
 			# xdelta exits 1 on success
 			if ($ret == 1) {
 				my $size=(stat("$tempdir/tmpdelta"))[7];
@@ -297,7 +297,7 @@
 		my $tempdir=tempdir();
 		my $tfile="$tempdir/".basename($file).".gz";
 		doit_redir($file, $tfile, @zgz);
-		doit("xdelta", "patch", "--pristine", $delta->{delta}, $tfile, "$file.gz");
+		doit("xdelta1", "patch", "--pristine", $delta->{delta}, $tfile, "$file.gz");
 	}
 	else {
 		doit_redir("$file", "$file.gz", @zgz);

Places

File pristine-tar-xdelta1.patch of Package pristine-tar

Places