summaryrefslogtreecommitdiff
path: root/cmdline/apt-get.cc
diff options
context:
space:
mode:
authorChristian PERRIER <bubulle@debian.org>2013-08-17 07:58:13 +0200
committerChristian PERRIER <bubulle@debian.org>2013-08-17 07:58:13 +0200
commit010364b7b52af9f6f4d8cbb6391a721260b6ffb5 (patch)
tree3ea2ba749956270d53f4705a1358af01b3b060fe /cmdline/apt-get.cc
parent34b769c51ac7cf747fb9dc5b8a5697c1c292360b (diff)
parent488011fa99aee25bedb39ae2cc3115ad1ab000c0 (diff)
Merge branch 'debian/sid' of git://git.debian.org/git/apt/apt into debian/sid
Diffstat (limited to 'cmdline/apt-get.cc')
-rw-r--r--cmdline/apt-get.cc6
1 files changed, 6 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;