Clone removes destination directory on error. Closes:#736153.

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 86613399893cb7915bd9427ff4f70cc874a67909..42fa30688d3d81d1bc36ff98c80900e4719a7153 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -44,6 +44,7 @@ our $buildproductsdir = '..';
 our $new_package = 0;
 our $ignoredirty = 0;
 our $noquilt = 0;
 our $new_package = 0;
 our $ignoredirty = 0;
 our $noquilt = 0;

+our $rmonerror = 1;

 our $existing_package = 'dpkg';
 our $cleanmode = 'dpkg-source';
 our $changes_since_version;
 our $existing_package = 'dpkg';
 our $cleanmode = 'dpkg-source';
 our $changes_since_version;


@@ -120,6 +121,15 @@ sub dscfn ($) {
 our $us = 'dgit';
 our $debugprefix = '';
 
 our $us = 'dgit';
 our $debugprefix = '';
 

+our @end;
+END { 
+    local ($?);
+    foreach my $f (@end) {
+       eval { $f->(); };
+       warn "$us: cleanup: $@" if length $@;
+    }
+};
+

 sub printdebug { print DEBUG $debugprefix, @_ or die $!; }
 
 sub fail { 
 sub printdebug { print DEBUG $debugprefix, @_ or die $!; }
 
 sub fail { 


@@ -1486,7 +1496,22 @@ sub cmd_clone {
        badusage "incorrect arguments to dgit clone";
     }
     $dstdir ||= "$package";
        badusage "incorrect arguments to dgit clone";
     }
     $dstdir ||= "$package";

+
+    my $cwd_remove;
+    if ($rmonerror && !$dryrun_level) {
+       $cwd_remove= getcwd();
+       unshift @end, sub { 
+           return unless defined $cwd_remove;
+           if (!chdir "$cwd_remove") {
+               return if $!==&ENOENT;
+               die "chdir $cwd_remove: $!";
+           }
+           rmtree($dstdir) or die "remove $dstdir: $!\n";
+       };
+    }
+

     clone($dstdir);
     clone($dstdir);

+    $cwd_remove = undef;

 }
 
 sub branchsuite () {
 }
 
 sub branchsuite () {


@@ -2049,6 +2074,9 @@ sub parseopts () {
            } elsif (m/^--no-quilt-fixup$/s) {
                push @ropts, $_;
                $noquilt = 1;
            } elsif (m/^--no-quilt-fixup$/s) {
                push @ropts, $_;
                $noquilt = 1;

+           } elsif (m/^--no-rm-on-error$/s) {
+               push @ropts, $_;
+               $rmonerror = 0;

            } else {
                badusage "unknown long option \`$_'";
            }
            } else {
                badusage "unknown long option \`$_'";
            }