diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-09-09 10:56:23 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-09-14 15:22:18 +0200 |
| commit | 9777639ef84917f37b0c225a99676e3f0f85421a (patch) | |
| tree | 2cd34690dbd789d1836a1c01df5a570ddc82758e /apt-private/private-install.cc | |
| parent | 188a6fcf4f13df1fd362a0aff27a23493ddd1ec5 (diff) | |
do not discard new manual-bits while applying EDSP solutions
In private-install.cc we call MarkInstall with FromUser=true, which sets
the bit accordingly, but while applying the EDSP solution we call mark
install on all packages with FromUser=false, so MarkInstall believes
this install is an automatic one and sets it to auto – so that a new package
which is explicitely installed via an external solver is marked as auto
and is hence also up for garbage collection in a following call.
Ideally MarkInstall wouldn't reset it, but the detection is hard to do
without regressing in other cases – and ideally ideally MarkInstall
wouldn't deal with the autobit at all – so we work around this on the
calling side for now.
Diffstat (limited to 'apt-private/private-install.cc')
| -rw-r--r-- | apt-private/private-install.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc index 3647ca99d..28b8d9a7b 100644 --- a/apt-private/private-install.cc +++ b/apt-private/private-install.cc @@ -560,13 +560,8 @@ bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache, if (Fix != NULL && _config->FindB("APT::Get::AutoSolving", true) == true) { - for (unsigned short i = 0; order[i] != 0; ++i) - { - if (order[i] != MOD_INSTALL) - continue; - InstallAction.propergateReleaseCandiateSwitching(helper.selectedByRelease, c0out); - InstallAction.doAutoInstall(); - } + InstallAction.propergateReleaseCandiateSwitching(helper.selectedByRelease, c0out); + InstallAction.doAutoInstall(); } if (_error->PendingError() == true) |