[setup - the official Cygwin setup program] branch master, updated. release_2.885-2-ga3a2e82

[setup - the official Cygwin setup program] branch master, updated. release_2.885-2-ga3a2e82

[jturney]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=a3a2e82d5609b868533fd721680d1439b0cecf82

commit a3a2e82d5609b868533fd721680d1439b0cecf82
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Wed Jan 31 14:21:09 2018 +0000

    Allow depends: to be empty
    
    If a version section has no depends:, we'll end up using any previous
    requires: or depends: seen.
    
    This isn't quite right, and we should only use the requires: (if any) if a
    particular version section has no depends:
    
    For the moment, just allow an empty depends:, so a version section can be
    explicitly marked as having no depends:

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=0e86070950fe0b1a17440d862de7a35a7027b05c

commit 0e86070950fe0b1a17440d862de7a35a7027b05c
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue Jan 30 21:14:07 2018 +0000

    Apply default problem solutions in unattended mode
    
    Also log problems
    Also make --include-source work in unattended mode


Diff:
---
 iniparse.yy |    4 ++--
 prereq.cc   |    7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/iniparse.yy b/iniparse.yy
index e5c514b..1999536 100644
--- a/iniparse.yy
+++ b/iniparse.yy
@@ -127,8 +127,8 @@ versioninfo: /* empty */
  | OPENBRACE STRING CLOSEBRACE { iniBuilder->buildSourceNameVersion ($2); }
  ;
 
-versionedpackagelist /* non-empty */
- : versionedpackageentry
+versionedpackagelist: /* empty */
+ | versionedpackageentry
  | versionedpackagelist listseparator versionedpackageentry
  ;
 
diff --git a/prereq.cc b/prereq.cc
index 8fcd3ba..033f654 100644
--- a/prereq.cc
+++ b/prereq.cc
@@ -69,6 +69,7 @@ PrereqPage::OnActivate()
   std::string s;
   PrereqChecker p;
   p.getUnmetString (s);
+  Log (LOG_PLAIN) << s << endLog;
   SetDlgItemText (GetHWND (), IDC_PREREQ_EDIT, s.c_str ());
 
   SetFocus (GetDlgItem (IDC_PREREQ_CHECK));
@@ -132,6 +133,12 @@ PrereqPage::OnUnattended ()
   if (unattended_mode == chooseronly)
     return -1;
 
+  packagedb db;
+  db.solution.applyDefaultProblemSolutions();
+
+  PrereqChecker p;
+  p.finalize();
+
   return IDD_CONFIRM;
 }