diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-06-18 20:23:53 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-06-18 20:23:53 +0200 |
| commit | bc5095b7d708c7e376f98be6edc2ad7cceca57ed (patch) | |
| tree | 8b45f6fc974330f964bad3684ac85550480fb66b /apt-private/private-install.h | |
| parent | 456821f91483f45b3ceb156f54ccc27983b71595 (diff) | |
| parent | 51da0c3587c9d36a3c04b3e28b99d8331a29b230 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
Diffstat (limited to 'apt-private/private-install.h')
| -rw-r--r-- | apt-private/private-install.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-private/private-install.h b/apt-private/private-install.h index 828163e40..8daa4a776 100644 --- a/apt-private/private-install.h +++ b/apt-private/private-install.h @@ -21,8 +21,8 @@ class pkgProblemResolver; APT_PUBLIC bool DoInstall(CommandLine &Cmd); bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache, - std::map<unsigned short, APT::VersionSet> &verset); -bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache); + std::map<unsigned short, APT::VersionSet> &verset, int UpgradeMode); +bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache, int UpgradeMode); APT_PUBLIC bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, bool Safety = true); |