diff options
| author | Michael Vogt <mvo@debian.org> | 2013-08-28 12:46:49 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-08-28 12:46:49 +0200 |
| commit | dbf8fc0419831c83e83165de8c434782165aa400 (patch) | |
| tree | 34d001d09adba9cded4658a506741e949827bfff /apt-private/private-upgrade.cc | |
| parent | 2004d64720b396ae2dc9d2a7f6bf7859d6d7ee9b (diff) | |
| parent | 45dc05ff2f51612945232dac469ac1c6926d4019 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into feature/upgrade-with-new
Diffstat (limited to 'apt-private/private-upgrade.cc')
| -rw-r--r-- | apt-private/private-upgrade.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/apt-private/private-upgrade.cc b/apt-private/private-upgrade.cc index eb546e3e3..09085c2db 100644 --- a/apt-private/private-upgrade.cc +++ b/apt-private/private-upgrade.cc @@ -13,9 +13,6 @@ packages */ bool DoUpgradeNoNewPackages(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; @@ -26,6 +23,10 @@ bool DoUpgradeNoNewPackages(CommandLine &CmdL) ShowBroken(c1out,Cache,false); return _error->Error(_("Internal error, AllUpgrade broke stuff")); } + + // parse additional cmdline pkg manipulation switches + if(!DoCacheManipulationFromCommandLine(CmdL, Cache)) + return false; return InstallPackages(Cache,true); } @@ -34,9 +35,6 @@ bool DoUpgradeNoNewPackages(CommandLine &CmdL) // DoSafeUpgrade - Upgrade all packages with install but not remove /*{{{*/ bool DoUpgradeWithAllowNewPackages(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; @@ -47,6 +45,10 @@ bool DoUpgradeWithAllowNewPackages(CommandLine &CmdL) ShowBroken(c1out,Cache,false); return _error->Error(_("Internal error, AllUpgrade broke stuff")); } + + // parse additional cmdline pkg manipulation switches + if(!DoCacheManipulationFromCommandLine(CmdL, Cache)) + return false; return InstallPackages(Cache,true); } |