diff options
| author | Julian Andres Klode <jak@debian.org> | 2017-07-27 15:47:59 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2017-07-27 15:47:59 +0200 |
| commit | eb0ccb003ceedac0fd78fee05d7b8119dd04c48b (patch) | |
| tree | e57bfde27e898972beaf875ea9315394e7502087 | |
| parent | e1d66c94e6ed6d79ba0f089fc00789bf7fd161d8 (diff) | |
Always warn if --force-yes is validly specified, not just if used
The code only used to warn when it came into a situation where
something actually had to be forced. Warn directly after parsing
the command-line instead, that's more accurate.
| -rw-r--r-- | apt-private/private-cmndline.cc | 5 | ||||
| -rw-r--r-- | apt-private/private-download.cc | 1 | ||||
| -rw-r--r-- | apt-private/private-install.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 2ecc47ba4..f5f1cc04e 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -539,6 +539,11 @@ std::vector<CommandLine::Dispatch> ParseCommandLine(CommandLine &CmdL, APT_CMD c exit(100); } + if (_config->FindB("APT::Get::Force-Yes", false) == true) + { + _error->Warning(_("--force-yes is deprecated, use one of the options starting with --allow instead.")); + } + // See if the help should be shown if (_config->FindB("help") == true || _config->FindB("version") == true || (CmdL.FileSize() > 0 && strcmp(CmdL.FileList[0], "help") == 0)) diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc index 25dee318e..77c35f4de 100644 --- a/apt-private/private-download.cc +++ b/apt-private/private-download.cc @@ -79,7 +79,6 @@ bool AuthPrompt(std::vector<std::string> const &UntrustedList, bool const Prompt return true; } else if (_config->FindB("APT::Get::Force-Yes",false) == true) { - _error->Warning(_("--force-yes is deprecated, use one of the options starting with --allow instead.")); return true; } diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc index aafe5542d..b24b96351 100644 --- a/apt-private/private-install.cc +++ b/apt-private/private-install.cc @@ -188,10 +188,6 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety) if (_config->FindI("quiet",0) >= 2 || _config->FindB("APT::Get::Assume-Yes",false) == true) { - if (_config->FindB("APT::Get::Force-Yes",false) == true) { - _error->Warning(_("--force-yes is deprecated, use one of the options starting with --allow instead.")); - } - if (Fail == true && _config->FindB("APT::Get::Force-Yes",false) == false) { if (Essential == true && _config->FindB("APT::Get::allow-remove-essential", false) == false) return _error->Error(_("Essential packages were removed and -y was used without --allow-remove-essential.")); |