From: Ken Brown <kbrown@cornell.edu>
To: cygwin-apps@cygwin.com
Subject: [PATCH setup 1/5] Just retry download after error in unattended mode
Date: Fri, 10 Nov 2017 14:43:00 -0000 [thread overview]
Message-ID: <20171110144339.12616-2-kbrown@cornell.edu> (raw)
In-Reply-To: <20171110144339.12616-1-kbrown@cornell.edu>
After a download error, setup was going back to IDD_SITE. This is
pointless in unattended mode, since no changes in the mirrors or
packages can be made.
Change misleading comment about retries in unattended mode; the Yes/No
dialog is not used in that case.
---
download.cc | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/download.cc b/download.cc
index e561c24..f6aa6fc 100644
--- a/download.cc
+++ b/download.cc
@@ -244,11 +244,7 @@ do_download_thread (HINSTANCE h, HWND owner)
if (errors)
{
- /* In unattended mode, all dialog boxes automatically get
- answered with a Yes/OK/other positive response. This
- means that if there's a download problem, setup will
- potentially retry forever if we don't take care to give
- up at some finite point. */
+ // In unattended mode we retry the download, but not forever.
static int retries = 4;
if (unattended_mode && retries-- <= 0)
{
@@ -260,7 +256,8 @@ do_download_thread (HINSTANCE h, HWND owner)
{
Log (LOG_PLAIN) << "download error in unattended_mode: " << retries
<< (retries > 1 ? " retries" : " retry") << " remaining." << endLog;
- return IDD_SITE;
+ Progress.SetActivateTask (WM_APP_START_DOWNLOAD);
+ return IDD_INSTATUS;
}
else if (yesno (owner, IDS_DOWNLOAD_INCOMPLETE) == IDYES)
return IDD_SITE;
--
2.15.0
next prev parent reply other threads:[~2017-11-10 14:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-10 14:43 [PATCH setup 0/5] Improve behavior after download error, v2 Ken Brown
2017-11-10 14:43 ` Ken Brown [this message]
2017-11-10 14:43 ` [PATCH setup 2/5] Fix off-by-one error in download retry report Ken Brown
2017-11-10 14:43 ` [PATCH setup 3/5] Remove "Try again?" from exit message Ken Brown
2017-11-10 14:43 ` [PATCH setup 4/5] Query user after download error in interactive mode Ken Brown
2017-11-10 14:43 ` [PATCH setup 5/5] Limit the number of packages shown in the IDD_DOWNLOAD_ERROR listbox Ken Brown
2017-11-13 11:51 ` [PATCH setup 0/5] Improve behavior after download error, v2 Jon Turney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171110144339.12616-2-kbrown@cornell.edu \
--to=kbrown@cornell.edu \
--cc=cygwin-apps@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).