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: 1.1.exp1~44
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/2a49601f69e08f06fb2727d869d420daacdd09d5

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 eaa50519c..cce80ccfe 100644
--- 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 5b0aaec3d..0e3529006 100644
--- 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: