summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-20 18:30:50 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-20 23:51:22 +0100
commit831a6e07cc5599fdd616dc1eddbabb6d6b5a87a9 (patch)
tree1c807d1afab999ff9dc2bb00bdfb26e06a3dc4fe /dgit
parent10d3925a7aebac484e09aa2d636ceae1cbffeb10 (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>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit22
1 files changed, 15 insertions, 7 deletions
diff --git a/dgit b/dgit
index 2cf78ec..9084eaf 100755
--- 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;