From 82e7f817a434e29df9ec6fbf19acfd8e7cd890e5 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Fri, 17 Jan 2014 07:48:43 +0100
Subject: add apt upgrade --dist

---
 cmdline/apt.cc | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'cmdline/apt.cc')

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
-- 
cgit v1.2.3