On 24/07/2013 21:53, Achim Gratz wrote:
> From 1686e0beac98867bf1fe358a8fe9a9d8647d4a3a Mon Sep 17 00:00:00 2001
> From: Achim Gratz <stromeko-gl6zormxvad+tktra80...@public.gmane.org>
> Date: Fri, 8 Feb 2013 20:58:20 +0100
> Subject: [PATCH 1/4] Remove detrimental initialization
>
> * choose.cc (createListview): Remove superflous and detrimental
> default trust setting. This has already been set correctly
> in OnInit.
> ---
> choose.cc | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/choose.cc b/choose.cc
> index 6d5f3b7..4e0bcd4 100644
> --- a/choose.cc
> +++ b/choose.cc
> @@ -148,11 +148,6 @@ ChooserPage::createListview ()
> log (LOG_BABBLE) << "Failed to set View button caption %ld" <<
> GetLastError () << endLog;
>
> - for (packagedb::packagecollection::iterator i = db.packages.begin(); i !=
> db.packages.end(); i++)
> - {
> - i->second->set_requirements(chooser->deftrust);
> - }
> -
There have been a few reports that setup no longer installs the dependencies
of explicitly specified packages in unattended mode, and this seems to be the
culprit.
A small patch to fix this is attached.
(I note with amazement that setup has two dependency solvers: one in
PrereqChecker, and one in packageversion)
>From 29da1520437fc3edfe9b53b7e07441af91d2b1ad Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.tur...@dronecode.org.uk>
Date: Mon, 7 Oct 2013 15:07:35 +0100
Subject: [PATCH setup] Fix selecting of package dependencies in unattended
mode
Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk>
---
prereq.cc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/prereq.cc b/prereq.cc
index 675bdfe..a46ca7e 100644
--- a/prereq.cc
+++ b/prereq.cc
@@ -150,9 +150,10 @@ PrereqPage::OnUnattended ()
if (unattended_mode == chooseronly)
return -1;
- // in unattended mode, carry on to download/install
- // (this can only happen if there some kind of problem with dependencies, as
all required dependencies
- // should be selected automatically by the chooser page in unattended mode,
so we should never get here)
+ // in unattended mode, add the missing requirements, then carry on to
download/install
+ PrereqChecker p;
+ p.selectMissing ();
+
return whatNext();
}
--
1.8.3.4
