diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-20 18:30:50 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-20 23:51:22 +0100 |
commit | 831a6e07cc5599fdd616dc1eddbabb6d6b5a87a9 (patch) | |
tree | 1c807d1afab999ff9dc2bb00bdfb26e06a3dc4fe | |
parent | 10d3925a7aebac484e09aa2d636ceae1cbffeb10 (diff) |
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>
-rw-r--r-- | debian/changelog | 5 | ||||
-rwxr-xr-x | dgit | 22 |
2 files changed, 20 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 4be989d..68ec24e 100644 --- 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 @@ -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; |