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 /apt-private/private-cmndline.cc | |
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.
Diffstat (limited to 'apt-private/private-cmndline.cc')
-rw-r--r-- | apt-private/private-cmndline.cc | 5 |
1 files changed, 5 insertions, 0 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)) |