diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:16:21 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:16:21 +0200 |
| commit | 2a49601f69e08f06fb2727d869d420daacdd09d5 (patch) | |
| tree | a46b3c525f379f0438454f0ee73bc12971caa291 | |
| parent | 3f961c9866df93e6eef8d802527e3eb920be7124 (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 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: |