From: Joey Hess <joey@kitenet.net>
Date: Mon, 9 Jan 2012 16:20:46 +0000 (-0400)
Subject: refactor and fix a minor bug
X-Git-Tag: 1.18~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b7c4883c1a4b97c8783705ab16cacfaf6ce1f9a9;p=tools%2Fpristine-tar.git

refactor and fix a minor bug
---

diff --git a/Pristine/Tar.pm b/Pristine/Tar.pm
index 1d31a48..3f10788 100644
--- a/Pristine/Tar.pm
+++ b/Pristine/Tar.pm
@@ -11,7 +11,7 @@ use IPC::Open2;
 use Exporter q{import};
 
 our @EXPORT = qw(error message debug vprint doit try_doit doit_redir
-	tempdir dispatch
+	tempdir dispatch comparefiles
 	$verbose $debug $keep);
 
 our $verbose=0;
@@ -107,4 +107,15 @@ sub dispatch {
 	$i->[0]->(@ARGV);
 }
 
+sub comparefiles {
+	my ($old, $new) = (shift, shift);
+	system('cmp', '-s', $old, $new);
+
+	if ($? == -1 || $? & 127) {
+		die("Failed to execute cmp: $!\n");
+	}
+
+	return $? >> 8;
+}
+
 1
diff --git a/pristine-bz2 b/pristine-bz2
index 1812a36..147ad86 100755
--- a/pristine-bz2
+++ b/pristine-bz2
@@ -154,17 +154,6 @@ sub predictbzip2args {
 	return @args;
 }
 
-sub comparefiles {
-	my ($old, $new) = (shift, shift);
-	system('cmp', '-s', $old, $new);
-
-	if ($? == -1 || $? & 127) {
-		die("Failed to execute cmp: $!\n");
-	}
-
-	return $? >> 8;
-}
-
 sub testvariant {
 	my ($old, $tmpin, $bzip2_program, @args) = @_;
 
@@ -264,7 +253,7 @@ sub genbz2 {
 		next if $param eq '--suse-pbzip2';
 		die "paranoia check failed on params from delta (@params)";
 	}
-	my @params=split(' ', $delta->{params});
+	@params=split(' ', $delta->{params});
 
 	my $program=$delta->{program};
 	if (! grep { $program eq $_ } @supported_bzip2_programs) {