summaryrefslogtreecommitdiff
path: root/apt-private
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2015-08-14 18:27:24 +0200
committerJulian Andres Klode <jak@debian.org>2015-08-14 18:27:24 +0200
commitf66738d7fb8978eaa30a179ae4f3bcc4ca7aa58f (patch)
tree1d6d7ff509eb178a15839998ce7b6901ea9c052d /apt-private
parentc38847ebbbab115b01dd1421dee55d5a50d404f1 (diff)
Make auto-remove and auto-clean aliases for the versions without -
Some people type them instead of autoremove and autoclean, so make them happy. Closes: #274159 Makes-Happy: Ansgar
Diffstat (limited to 'apt-private')
-rw-r--r--apt-private/private-cmndline.cc4
-rw-r--r--apt-private/private-install.cc3
2 files changed, 4 insertions, 3 deletions
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 487349c8c..3a1564b23 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -169,14 +169,14 @@ static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const
addArg(0,"format","APT::Get::IndexTargets::Format", CommandLine::HasArg);
addArg(0,"release-info","APT::Get::IndexTargets::ReleaseInfo", 0);
}
- else if (CmdMatches("clean", "autoclean", "check", "download", "changelog") ||
+ else if (CmdMatches("clean", "autoclean", "auto-clean", "check", "download", "changelog") ||
CmdMatches("markauto", "unmarkauto")) // deprecated commands
;
else if (CmdMatches("moo"))
addArg(0, "color", "APT::Moo::Color", 0);
if (CmdMatches("install", "remove", "purge", "upgrade", "dist-upgrade",
- "dselect-upgrade", "autoremove", "clean", "autoclean", "check",
+ "dselect-upgrade", "autoremove", "auto-remove", "clean", "autoclean", "auto-clean", "check",
"build-dep", "full-upgrade", "source"))
{
addArg('s', "simulate", "APT::Get::Simulate", 0);
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index 96e33f7de..e61c4ca51 100644
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -519,7 +519,8 @@ bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache,
_config->Set("APT::Get::Purge", true);
fallback = MOD_REMOVE;
}
- else if (strcasecmp(CmdL.FileList[0], "autoremove") == 0)
+ else if (strcasecmp(CmdL.FileList[0], "autoremove") == 0 ||
+ strcasecmp(CmdL.FileList[0], "auto-remove") == 0)
{
_config->Set("APT::Get::AutomaticRemove", "true");
fallback = MOD_REMOVE;