summaryrefslogtreecommitdiff
path: root/cmdline/apt-get.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-08-28 09:15:26 +0200
committerMichael Vogt <mvo@debian.org>2013-08-28 09:15:26 +0200
commit45dc05ff2f51612945232dac469ac1c6926d4019 (patch)
tree0fa9bbc55e5b07f19beef083c8b21390679f368a /cmdline/apt-get.cc
parent7e7cf2734543ee32401c0308e582406d2c9a28ec (diff)
parentd8a8f9d7f01c75a7bbad7a488bf359a94291d1de (diff)
Merge remote-tracking branch 'mvo/feature/upgrade-with-cmdline' into debian/sid
Diffstat (limited to 'cmdline/apt-get.cc')
-rw-r--r--cmdline/apt-get.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 93c21651f..c273dfaaa 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -350,9 +350,6 @@ 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;
@@ -365,6 +362,10 @@ bool DoDistUpgrade(CommandLine &CmdL)
return false;
}
+ // parse additional cmdline pkg manipulation switches
+ if(!DoCacheManipulationFromCommandLine(CmdL, Cache))
+ return false;
+
c0out << _("Done") << endl;
return InstallPackages(Cache,true);