From a7bf9dcd301f86ba6f757234f218dadaaa756aeb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Nov 2010 21:14:25 -0400 Subject: [PATCH] bugfix --- Pristine/Tar.pm | 5 +++-- pristine-tar | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Pristine/Tar.pm b/Pristine/Tar.pm index 68e202f..7fa4498 100644 --- a/Pristine/Tar.pm +++ b/Pristine/Tar.pm @@ -10,7 +10,8 @@ use Getopt::Long; use IPC::Open2; use Exporter q{import}; -our @EXPORT = qw(error message debug vprint doit doit_redir tempdir dispatch +our @EXPORT = qw(error message debug vprint doit try_doit doit_redir + tempdir dispatch $verbose $debug $keep); our $verbose=0; @@ -34,7 +35,7 @@ sub vprint { } sub doit { - if (maybe_doit(@_) != 0) { + if (try_doit(@_) != 0) { error "command failed: @_"; } } diff --git a/pristine-tar b/pristine-tar index a973be4..1aae144 100755 --- a/pristine-tar +++ b/pristine-tar @@ -325,7 +325,7 @@ sub recreatetarball { sub recreatetarball_helper { my $tempdir=$recreatetarball_tempdir; - + my $ret="$tempdir/recreatetarball"; doit("tar", "cf", $ret, "--owner", 0, "--group", 0, @@ -369,7 +369,7 @@ sub gentar { my @try; push @try, sub { recreatetarball($delta->{manifest}, getcwd, clobber_source => 0, %opts) }; - push @try, &recreatetarball_longlink_100; + push @try, \&recreatetarball_longlink_100; my $ok; foreach my $variant (@try) { -- 2.7.4