improve an error message; fix fetch when we have already fetched

[dgit.git] / dgit

diff --git a/dgit b/dgit
index a2f3eae095f8ec45881b55f08088e946ba7ad22f..666e2b2c8ad8fca044ea8a39fafe44dc3a8ec2a5 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -104,6 +104,14 @@ sub runcmd {
     die "@_ $! $?" if system @_;
 }
 
+sub printdone {
+    if (!$dryrun) {
+       print "dgit ok: @_\n";
+    } else {
+       print "would be ok: @_ (but dry run only)\n";
+    }
+}
+
 sub cmdoutput_errok {
     die Dumper(\@_)." ?" if grep { !defined } @_;
     printcmd(\*DEBUG,"|",@_) if $debug>0;
@@ -146,7 +154,7 @@ our %defcfg = ('dgit.default.distro' => 'debian',
               'dgit-distro.debian.git-path' => '/git/dgit-repos',
               'dgit-distro.debian.git-check' => 'ssh-cmd',
               'dgit-distro.debian.git-create' => 'ssh-cmd',
-              'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/');
+              'dgit-distro.debian.mirror' => 'http://http.debian.net/debian/');
 
 sub cfg {
     foreach my $c (@_) {
@@ -406,10 +414,11 @@ Last allegedly pushed/uploaded: $oldclogp->{Version} (newer or same)
 Perhaps the upload is stuck in incoming.  Using the version from git.
 END
             $outputhash = $upload_hash;
-       } else {
-           die "version in archive is same as version in git".
-               " to-be-uploaded (upload/) branch but archive".
-               " version hash no commit hash?!\n";
+       } elsif ($outputhash ne $upload_hash) {
+           die "version in archive ($clogp->{Version})".
+               " is same as version in git".
+               " to-be-uploaded (upload/) branch ($oldclogp->{Version})".
+               " but archive version hash no commit hash?!\n";
         }
     }
     chdir '../../../..' or die $!;
@@ -524,7 +533,7 @@ sub clone ($) {
     }
     fetch_from_archive() or die;
     runcmd @git, qw(reset --hard), lrref();
-    print "dgit ok: ready for work in $dstdir\n";
+    printdone "ready for work in $dstdir";
 }
 
 sub fetch () {
@@ -532,7 +541,7 @@ sub fetch () {
        git_fetch_us();
     }
     fetch_from_archive() or die;
-    print "dgit ok: fetched into ".lrref()."\n";
+    printdone "fetched into ".lrref();
 }
 
 sub pull () {
@@ -595,7 +604,7 @@ sub dopush () {
     my $host = access_cfg('upload-host');
     my @hostarg = defined($host) ? ($host,) : ();
     runcmd_ordryrun @dput, @hostarg, $changesfile;
-    print "dgit ok: pushed and uploaded $dsc->{Version}\n";
+    printdone "pushed and uploaded $dsc->{Version}";
 }
 
 sub cmd_clone {
@@ -740,6 +749,7 @@ sub parseopts () {
 }
 
 parseopts();
+print STDERR "DRY RUN ONLY\n" if $dryrun;
 die unless @ARGV;
 my $cmd = shift @ARGV;