Parcourir la source

0.6.46.3ubuntu2 change as uploaded: fix dist-upgrade

Ian Jackson il y a 19 ans
Parent
commit
07494f6580
2 fichiers modifiés avec 8 ajouts et 0 suppressions
  1. 1 0
      apt-pkg/algorithms.cc
  2. 7 0
      debian/changelog

+ 1 - 0
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;
 		  }
 

+ 7 - 0
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: