merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

    arguments (closes: #705510)

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index eaa50519cc3e2dfc729a2df3d80e609ccfbc0d62..cce80ccfeac3200e9b1eacb557f16baa634a83b0 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1845,6 +1845,9 @@ bool DoAutomaticRemove(CacheFile &Cache)
    packages */
 bool DoUpgrade(CommandLine &CmdL)
 {
+   if (CmdL.FileSize() != 1)
+      return _error->Error(_("The upgrade command takes no arguments"));
+
    CacheFile Cache;
    if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
       return false;
@@ -2178,6 +2181,9 @@ bool DoMarkAuto(CommandLine &CmdL)
 /* Intelligent upgrader that will install and remove packages at will */
 bool DoDistUpgrade(CommandLine &CmdL)
 {
+   if (CmdL.FileSize() != 1)
+      return _error->Error(_("The dist-upgrade command takes no arguments"));
+
    CacheFile Cache;
    if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
       return false;

diff --git a/debian/changelog b/debian/changelog
index 5b0aaec3d2d8836f58adb29fd685573de56800e6..0e3529006fbb095f2fac6b6b1cb019a72de5762d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ apt (0.9.8~exp1) UNRELEASED; urgency=low
   
   [ Daniel Hartwig ]
   * Clarify units of Acquire::http::Dl-Limit (closes: #705445)
+  * Show a error message if {,dist-}upgrade is used with additional
+    arguments (closes: #705510)
 
   [ Michael Vogt ]
   * lp:~mvo/apt/webserver-simulate-broken-with-fix346386: