diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-27 22:52:34 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-27 22:52:34 +0100 |
| commit | fce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a (patch) | |
| tree | be7d18baa836e9df166ec63f6c9fe6f94bb84b40 /apt-private/private-install.h | |
| parent | a5e790985752c6820e08e7a7e650e1607fa826e4 (diff) | |
| parent | fc104da6a583736223b2f941e43a05ea26b63a7d (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-private/private-list.cc
configure.ac
debian/apt.install.in
debian/changelog
Diffstat (limited to 'apt-private/private-install.h')
| -rw-r--r-- | apt-private/private-install.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apt-private/private-install.h b/apt-private/private-install.h index fcf4cbced..2187146d3 100644 --- a/apt-private/private-install.h +++ b/apt-private/private-install.h @@ -14,6 +14,9 @@ bool DoInstall(CommandLine &Cmd); +bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache, + std::map<unsigned short, APT::VersionSet> &verset); +bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache); bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, bool Safety = true); @@ -92,6 +95,9 @@ struct TryToInstall { Cache->GetDepCache()->SetCandidateVersion(s->first); bool Success = true; + // the Changed list contains: + // first: "new version" + // second: "what-caused the change" std::list<std::pair<pkgCache::VerIterator, pkgCache::VerIterator> > Changed; for (std::list<std::pair<pkgCache::VerIterator, std::string> >::const_iterator s = start.begin(); s != start.end(); ++s) |