From 03d6505f0d2014b5563cd047e910a099d2cd2588 Mon Sep 17 00:00:00 2001 From: Andy Koppe Date: Sun, 15 Aug 2010 16:22:00 +0000 Subject: [PATCH] * postinstall.cc (PostInstallResultsPage::OnNext): Remove postinstall script error message box. * res.rc (IDS_POSTINSTALL): Try to make postinstall errors less scary. --- ChangeLog | 7 +++++++ postinstallresults.cc | 9 --------- res.rc | 6 ++++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d7daa68..bf68457b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-08-15 Andy Koppe + + * postinstall.cc (PostInstallResultsPage::OnNext): + Remove postinstall script error message box. + * res.rc (IDS_POSTINSTALL): Try to make postinstall errors + less scary. + 2010-08-11 Yaakov Selkowitz * bootstrap.sh: Allow running from a builddir. Run configure diff --git a/postinstallresults.cc b/postinstallresults.cc index ad38a829..2409f38d 100644 --- a/postinstallresults.cc +++ b/postinstallresults.cc @@ -54,15 +54,6 @@ PostInstallResultsPage::OnActivate() long PostInstallResultsPage::OnNext () { - // one or more postinstall scripts failed to run successfully - // installation may be broken - MessageBox (NULL, - "You will need to investigate and correct these errors " - "before your Cygwin installation will function properly.\n" - "Check setup.log for details.", - "ERROR - postinstall scripts failed", - MB_OK | MB_ICONERROR | MB_SETFOREGROUND | MB_TOPMOST); - return IDD_DESKTOP; } diff --git a/res.rc b/res.rc index 6a73dc66..9adec1f2 100644 --- a/res.rc +++ b/res.rc @@ -433,9 +433,11 @@ BEGIN ICON IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20 LTEXT "Postinstall script errors",IDC_STATIC_HEADER_TITLE ,7,0,258,8,NOT WS_GROUP - LTEXT "The following errors occured executing postinstall scripts", + LTEXT "These do not necessarily mean that affected packages " + "will fail to function properly, but please check " + "/var/log/setup.log.full and report any problems.", IDC_STATIC,21,9,239,16,NOT WS_GROUP - EDITTEXT IDC_POSTINSTALL_EDIT,7,41,303,124,WS_VSCROLL | WS_HSCROLL | + EDITTEXT IDC_POSTINSTALL_EDIT,7,41,303,112,WS_VSCROLL | WS_HSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | ES_AUTOVSCROLL -- 2.43.5