dgit build: Better message when network is offline.

When build fails because the archive access fails, mention that this
was tried because --since-version was not specified.

Closes:#883340.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 4be989d89355f493ccf4e2e3b7201cc93c2e53c7..68ec24e7c40b8554f0b6a28e371791b1e73a1840 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ dgit (5.2~) unstable; urgency=medium
 
   * dgit(1): Mention under `dgit build' that it uses the network.
 
+  dgit:
+  * When build fails because the network is offline, mention
+    that this is because --since-version was not specified.
+    Closes:#883340.
+
  --
 
 dgit (5.1) unstable; urgency=medium

diff --git a/dgit b/dgit
index 2cf78ec7274e39d8c8fada21f8b0155c5be827e5..9084eaf237e7d38f32c1799ee4c58da3b5778b0d 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -6018,13 +6018,21 @@ sub changesopts_initial () {
 
 sub changesopts_version () {
     if (!defined $changes_since_version) {
-       my @vsns = archive_query('archive_query');
-       my @quirk = access_quirk();
-       if ($quirk[0] eq 'backports') {
-           local $isuite = $quirk[2];
-           local $csuite;
-           canonicalise_suite();
-           push @vsns, archive_query('archive_query');
+       my @vsns;
+       unless (eval {
+           @vsns = archive_query('archive_query');
+           my @quirk = access_quirk();
+           if ($quirk[0] eq 'backports') {
+               local $isuite = $quirk[2];
+               local $csuite;
+               canonicalise_suite();
+               push @vsns, archive_query('archive_query');
+           }
+           1;
+       }) {
+           print STDERR $@;
+           fail
+ "archive query failed (queried because --since-version not specified)";
        }
        if (@vsns) {
            @vsns = map { $_->[0] } @vsns;