diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-28 10:21:58 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-28 10:21:58 +0200 |
commit | c6ec544822a6a5db9f8a507b08381f19c8787761 (patch) | |
tree | f4cf7c2f2a21d29642bf13e87b792cbb9df688a3 /apt-pkg/algorithms.h | |
parent | f448075d89fedde182e6c2a59c89808e403b7f66 (diff) | |
parent | a2cba9cca24762c090ee6988f14ae40f92a6441f (diff) |
merged from debian-experimental
Diffstat (limited to 'apt-pkg/algorithms.h')
-rw-r--r-- | apt-pkg/algorithms.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index 99501bed1..86d5fbd53 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -78,6 +78,9 @@ private: /*}}}*/ class pkgProblemResolver /*{{{*/ { + /** \brief dpointer placeholder (for later in case we need it) */ + void *d; + pkgDepCache &Cache; typedef pkgCache::PkgIterator PkgIterator; typedef pkgCache::VerIterator VerIterator; @@ -105,6 +108,9 @@ class pkgProblemResolver /*{{{*/ void MakeScores(); bool DoUpgrade(pkgCache::PkgIterator Pkg); + + bool ResolveInternal(bool const BrokenFix = false); + bool ResolveByKeepInternal(); protected: bool InstOrNewPolicyBroken(pkgCache::PkgIterator Pkg); |