From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 23 Apr 2013 06:16:21 +0000 (+0200)
Subject: merge patch from Daniel Hartwig to  Show a error message if {,dist-}upgrade is used... 
X-Git-Tag: 0.9.11~7^2~2
X-Git-Url: https://git.hcoop.net/ntk/apt.git/commitdiff_plain/b9674b755d40b1394c397864d1fcd05ad58a88a2

merge patch from Daniel Hartwig to  Show a error message if {,dist-}upgrade is used with additional
    arguments (closes: #705510)
---

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 4b7691d9..d6a46c73 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1874,6 +1874,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;
@@ -2206,6 +2209,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 7075cb84..6172cb33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ apt (0.9.11) 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 <michael.vogt@ubuntu.com>  Thu, 15 Aug 2013 09:27:35 +0200