diff options
| author | Ian Jackson <ian@anarres> | 2006-12-08 18:21:59 +0000 |
|---|---|---|
| committer | Ian Jackson <ian@anarres> | 2006-12-08 18:21:59 +0000 |
| commit | 07494f6580dd689c1d82d8dc2f7dbbcfedaf6e52 (patch) | |
| tree | f597745eb775518e88610bda37feb8c6a51db03b | |
| parent | 9275e2f60319db714f7fbd20f1897e86a76aa130 (diff) | |
0.6.46.3ubuntu2 change as uploaded: fix dist-upgrade
| -rw-r--r-- | apt-pkg/algorithms.cc | 1 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 8 insertions, 0 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/debian/changelog b/debian/changelog index 6dc69ba12..6e57e1bf8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.46.3ubuntu2) feisty; urgency=low + + * apt-pkg/algorithms.cc: add missing call to MarkKeep + so that dist-upgrade isn't broken by unsatisfiable Breaks. + + -- Ian Jackson <iwj@ubuntu.com> Thu, 7 Dec 2006 15:46:52 +0000 + apt (0.6.45ubuntu6) edgy; urgency=low * Tests pass without code changes! Except that we need this: |