add apt upgrade --dist

diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index d6d7bca64be8ebedc56effc33e850d4e3ab0e46c..cbb40d42e7281d48111e4fc0d7ec440868e38a4b 100644 (file)
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -230,6 +230,11 @@ bool addArgumentsAPT(std::vector<CommandLine::Args> &Args, char const * const Cm
       addArg('v', "verbose", "APT::Cmd::List-Include-Summary", 0);
       addArg('a', "all-versions", "APT::Cmd::All-Versions", 0);
    }
       addArg('v', "verbose", "APT::Cmd::List-Include-Summary", 0);
       addArg('a', "all-versions", "APT::Cmd::All-Versions", 0);
    }

+   else if (CmdMatches("upgrade"))
+   {
+      // FIXME: find a better term
+      addArg(0,"dist","APT::Cmd::Dist-Upgrade", CommandLine::Boolean);
+   }

    else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd))
    {
        // we have no (supported) command-name overlaps so far, so we call
    else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd))
    {
        // we have no (supported) command-name overlaps so far, so we call

diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 4bcae0aba8ac71a07f9bc30d4e2679e899d83af7..4dc8266327260254fe9af548fc915438f10f4944 100644 (file)
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -86,6 +86,15 @@ bool ShowHelp(CommandLine &CmdL)
    return true;
 }
 
    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},
 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},
                                    {"install",&DoInstall},
                                    {"remove", &DoInstall},
                                    {"update",&DoUpdate},

-                                   {"upgrade",&DoUpgradeWithAllowNewPackages},
+                                   {"upgrade",&DoAptUpgrade},

                                    // misc
                                    {"edit-sources",&EditSources},
                                    // helper
                                    // misc
                                    {"edit-sources",&EditSources},
                                    // helper