* postinstall.cc (PostInstallResultsPage::OnNext):

        Remove postinstall script error message box.
        * res.rc (IDS_POSTINSTALL): Try to make postinstall errors
        less scary.

diff --git a/ChangeLog b/ChangeLog
index 1d7daa68996a4a38cbb606cfd54d087a53c73f1b..bf68457b269854fbac18ee51395698a210749dc4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-15  Andy Koppe  <andy.koppe@gmail.com>
+
+       * 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  <yselkowitz@users.sourceforge.net>
 
        * bootstrap.sh: Allow running from a builddir. Run configure

diff --git a/postinstallresults.cc b/postinstallresults.cc
index ad38a829185be77076868d8a4ae4f8ac08e7ffb9..2409f38d2c4756a04e48bdf3ddeb7a13e78dcde8 100644 (file)
--- 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 6a73dc660a6f90d54362cd25b5403588a75e9b1e..9adec1f286a43b82829cc209d1a149f2f8ecbee7 100644 (file)
--- 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