diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:16:21 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-08-15 09:30:45 +0200 |
| commit | b9674b755d40b1394c397864d1fcd05ad58a88a2 (patch) | |
| tree | 091b7a2d88fb3d9c6d3d8e2cd04519da5979410c | |
| parent | 0e279e3527ce3dc9de0e01441ad693f415e75d6a (diff) | |
merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used with additional
arguments (closes: #705510)
| -rw-r--r-- | cmdline/apt-get.cc | 6 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 4b7691d93..d6a46c73e 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 7075cb844..6172cb332 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 |