diff options
| -rw-r--r-- | apt-private/private-cmndline.cc | 3 | ||||
| -rw-r--r-- | apt-private/private-install.cc | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 588dea06b..2049842db 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -506,8 +506,7 @@ static void BinaryCommandSpecificConfiguration(char const * const Binary, char c // we support it anyhow, but allow it on the commandline to take effect // even through it isn't documented as a user who doesn't want it wouldn't // ask for it - _config->Set("Binary::apt-get::APT::Get::AutomaticRemove", false); - _config->Set("Binary::apt::APT::Get::AutomaticRemove", false); + _config->Set("APT::Get::AutomaticRemove", ""); } } #undef CmdMatches diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc index b110cbdc3..402f8f4b6 100644 --- a/apt-private/private-install.cc +++ b/apt-private/private-install.cc @@ -699,8 +699,8 @@ bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<PseudoPkg OpTextProgress Progress(*_config); bool const distUpgradeMode = strcmp(CmdL.FileList[0], "dist-upgrade") == 0 || strcmp(CmdL.FileList[0], "full-upgrade") == 0; - if (distUpgradeMode) - _config->CndSet("APT::Get::AutomaticRemove::Kernels", "true"); + if (distUpgradeMode && _config->Find("Binary") == "apt") + _config->CndSet("APT::Get::AutomaticRemove::Kernels", _config->FindB("APT::Get::AutomaticRemove", true)); bool resolver_fail = false; if (distUpgradeMode == true || UpgradeMode != APT::Upgrade::ALLOW_EVERYTHING) |