refactor and fix a minor bug

diff --git a/Pristine/Tar.pm b/Pristine/Tar.pm
index 1d31a4863da6d7d19caaacca706f7a9ee4e53825..3f1078860f904ef25e1febcc6a9edb1fdda18f6b 100644 (file)
--- 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 1812a36cc9bfe566b467e35ce2cbc1e8a520c4d3..147ad8604e360bc6259a8c121380029a6bddb9be 100755 (executable)
--- 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) {