summaryrefslogtreecommitdiff
path: root/apt-private
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2019-01-27 08:27:33 +0100
committerJosh Triplett <josh@joshtriplett.org>2019-01-27 08:27:33 +0100
commit0eceebbdfdc2c5e1d677bff95a9ac1ef2f728337 (patch)
treeea115e22ccc8ba68b83e5f86d3e90915b80943c9 /apt-private
parent4200469bb5a14c4659285917ed30c46a0b15c286 (diff)
downloadapt-0eceebbdfdc2c5e1d677bff95a9ac1ef2f728337.tar.gz
Add a "reinstall" command as an alias for "install --reinstall".
aptitude has a similar "reinstall" command for precedent.
Diffstat (limited to 'apt-private')
-rw-r--r--apt-private/private-cmndline.cc6
-rw-r--r--apt-private/private-install.cc4
2 files changed, 6 insertions, 4 deletions
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 87deb6bf0..494928332 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -175,7 +175,7 @@ static bool addArgumentsAPTHelper(std::vector<CommandLine::Args> &Args, char con
/*}}}*/
static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/
{
- if (CmdMatches("install", "remove", "purge", "upgrade", "dist-upgrade",
+ if (CmdMatches("install", "reinstall", "remove", "purge", "upgrade", "dist-upgrade",
"dselect-upgrade", "autoremove", "autopurge", "full-upgrade"))
{
addArg(0, "show-progress", "DpkgPM::Progress", 0);
@@ -239,7 +239,7 @@ static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const
else if (CmdMatches("moo"))
addArg(0, "color", "APT::Moo::Color", 0);
- if (CmdMatches("install", "remove", "purge", "upgrade", "dist-upgrade",
+ if (CmdMatches("install", "reinstall", "remove", "purge", "upgrade", "dist-upgrade",
"dselect-upgrade", "autoremove", "auto-remove", "autopurge", "clean", "autoclean", "auto-clean", "check",
"build-dep", "full-upgrade", "source"))
{
@@ -291,7 +291,7 @@ static bool addArgumentsAPTMark(std::vector<CommandLine::Args> &Args, char const
{
addArg('f',"file","Dir::State::extended_states",CommandLine::HasArg);
}
- else if (CmdMatches("install", "remove", "deinstall", "purge",
+ else if (CmdMatches("install", "reinstall", "remove", "deinstall", "purge",
"showinstall", "showinstalls", "showremove", "showremoves",
"showdeinstall", "showdeinstalls", "showpurge", "showpurges"))
;
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index 1713ff308..243b75b1c 100644
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -586,7 +586,9 @@ bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<PseudoPkg
Fix.reset(new pkgProblemResolver(Cache));
unsigned short fallback = MOD_INSTALL;
- if (strcasecmp(CmdL.FileList[0],"remove") == 0)
+ if (strcasecmp(CmdL.FileList[0], "reinstall") == 0)
+ _config->Set("APT::Get::ReInstall", "true");
+ else if (strcasecmp(CmdL.FileList[0],"remove") == 0)
fallback = MOD_REMOVE;
else if (strcasecmp(CmdL.FileList[0], "purge") == 0)
{