bugfix

toddr · Nov 12, 2010 · a7bf9dc · a7bf9dc
1 parent 5eedd9b
commit a7bf9dc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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) {