diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-12-14 11:50:19 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-12-14 11:50:19 +0100 |
| commit | 7570b65d5eae54c51689121a317351a1cd42e64d (patch) | |
| tree | f597745eb775518e88610bda37feb8c6a51db03b /apt-pkg | |
| parent | 308c7d30ed2e937cde65e5fed8cbf717fba113c3 (diff) | |
| parent | 07494f6580dd689c1d82d8dc2f7dbbcfedaf6e52 (diff) | |
* merged from ian
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/algorithms.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/pkgcache.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index f50c52a32..723c8ea3a 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -986,6 +986,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) } if (Debug) clog << " Will not break " << Pkg.Name() << " as stated in Breaks field in " << I.Name() <<endl; + Cache.MarkKeep(I, false, false); continue; } diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 35eb23dfa..93ad56641 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -54,7 +54,7 @@ pkgCache::Header::Header() /* Whenever the structures change the major version should be bumped, whenever the generator changes the minor version should be bumped. */ - MajorVersion = 5; + MajorVersion = 6; MinorVersion = 0; Dirty = false; |