From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11863 invoked by alias); 8 Feb 2020 14:01:05 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 11627 invoked by uid 9795); 8 Feb 2020 14:00:41 -0000 Date: Sat, 08 Feb 2020 14:01:00 -0000 Message-ID: <20200208140041.11615.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [setup - the official Cygwin setup program] branch master, updated. release_2.900-5-gad6cd84a X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: f58c79c482fe91691c334f4bcdb954ca29959a5e X-Git-Newrev: ad6cd84a3b4c30f6d19522b59df793633ef59eca X-SW-Source: 2020-q1/txt/msg00010.txt https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=ad6cd84a3b4c30f6d19522b59df793633ef59eca commit ad6cd84a3b4c30f6d19522b59df793633ef59eca Author: Jon Turney Date: Mon Jan 27 15:35:05 2020 +0000 Don't always be silent about failing to fetch mirrors.lst Currently, if there is no cached mirrors list (e.g. this is the first run), and we're behind some kind of proxy which doesn't let us through, we'll try to fetch mirrors.lst, silently fail, and present the user with an empty mirror list. Instead, report failure to fetch mirror.lst if we don't have a cached mirrored list (and a mirror isn't being explicitly specified with '--only-site --site '). Diff: --- res.rc | 1 + resource.h | 1 + site.cc | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/res.rc b/res.rc index e26f7171..fb0c5ace 100644 --- a/res.rc +++ b/res.rc @@ -608,4 +608,5 @@ BEGIN "will be nothing to install.\n\nPress OK if that's what you wanted\nor Cancel to choose a different directory." IDS_ELEVATED "Hand installation over to elevated child process." IDS_INSTALLEDB_VERSION "Unknown INSTALLED.DB version" + IDS_NO_MIRROR_LST "Could not download mirror sites list" END diff --git a/resource.h b/resource.h index 852bdc0b..a98924cc 100644 --- a/resource.h +++ b/resource.h @@ -41,6 +41,7 @@ #define IDS_DOWNLOAD_INCOMPLETE_EXIT 141 #define IDS_QUERY_CORRUPT 142 #define IDS_TRUSTSYNC_TOOLTIP 143 +#define IDS_NO_MIRROR_LST 144 // Dialogs diff --git a/site.cc b/site.cc index ccffef55..46ec53a3 100644 --- a/site.cc +++ b/site.cc @@ -341,7 +341,11 @@ get_site_list (HINSTANCE h, HWND owner) else { if (!cached_mirrors[0]) - Log (LOG_BABBLE) << "Defaulting to empty mirror list" << endLog; + { + if (!OnlySiteOption) + note(owner, IDS_NO_MIRROR_LST); + Log (LOG_BABBLE) << "Defaulting to empty mirror list" << endLog; + } else { mirrors = cached_mirrors;