From: Joey Hess <joey@kitenet.net>
Date: Wed, 4 Jan 2012 21:53:57 +0000 (-0400)
Subject: try --quirk suse
X-Git-Tag: 1.16~6^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b8b6cc8fdae7358d184132b28d268e8d4dede25d;p=tools%2Fpristine-tar.git

try --quirk suse
---

diff --git a/pristine-bz2 b/pristine-bz2
index f0e226a..9607abf 100755
--- a/pristine-bz2
+++ b/pristine-bz2
@@ -147,7 +147,7 @@ sub predictbzip2args {
 	push @args, "-$level";
 
 	if ($program eq 'zgz') {
-		push @args, '--old-bzip2';
+		push @args, "--old-bzip2";
 	}
 
 	return @args;
@@ -211,6 +211,12 @@ sub reproducebzip2 {
 
 		testvariant($orig, $tmpin, $program, @args)
 			&& return $program, @args;
+		
+		if ($program eq 'zgz') {
+			testvariant($orig, $tmpin, $program, @args,
+			            "--quirk", "suse")
+				&& return $program, @args, "--quirk", "suse";
+		}
 	}
 
 	# 7z has a weird syntax, not supported yet, as not seen in the wild
@@ -254,9 +260,15 @@ sub genbz2 {
 		fields => [qw{params program}]);
 
 	my @params=split(' ', $delta->{params});
-	foreach my $param (@params) {
+	while (@params) {
+		my $param=shift @params;
+
 		next if $param=~/^(-[1-9])$/;
 		next if $param eq '--old-bzip2';
+		if ($param eq '--quirk') {
+			shift @params;
+			next;
+		}
 		die "paranoia check failed on params from delta (@params)";
 	}