summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-01-17 07:48:43 +0100
committerMichael Vogt <mvo@debian.org>2014-01-17 07:48:43 +0100
commit82e7f817a434e29df9ec6fbf19acfd8e7cd890e5 (patch)
treedf72368ef295a7682c9cf19369493c8d7358d474 /cmdline
parent2a79257e96010318c4bc6d2f2e3e9c475e5bf445 (diff)
add apt upgrade --dist
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/apt.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 4bcae0aba..4dc826632 100644
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -86,6 +86,15 @@ bool ShowHelp(CommandLine &CmdL)
return true;
}
+// figure out what kind of upgrade the user wants
+bool DoAptUpgrade(CommandLine &CmdL)
+{
+ if (_config->FindB("Apt::Cmd::Dist-Upgrade"))
+ return DoDistUpgrade(CmdL);
+ else
+ return DoUpgradeWithAllowNewPackages(CmdL);
+}
+
int main(int argc, const char *argv[]) /*{{{*/
{
CommandLine::Dispatch Cmds[] = {{"list",&List},
@@ -95,7 +104,7 @@ int main(int argc, const char *argv[]) /*{{{*/
{"install",&DoInstall},
{"remove", &DoInstall},
{"update",&DoUpdate},
- {"upgrade",&DoUpgradeWithAllowNewPackages},
+ {"upgrade",&DoAptUpgrade},
// misc
{"edit-sources",&EditSources},
// helper