Просмотр исходного кода

* apt-pkg/algorithms.cc:
- if the package was explicitly marked as ToRemove don't
consider it as a candidate for FixByInstall

David Kalnischkies лет назад: 15
Родитель
Сommit
a3f1a6ccd2
2 измененных файлов с 5 добавлено и 1 удалено
  1. 1 0
      apt-pkg/algorithms.cc
  2. 4 1
      debian/changelog

+ 1 - 0
apt-pkg/algorithms.cc

@@ -1062,6 +1062,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 			else if (TryFixByInstall == true &&
 				 Start.TargetPkg()->CurrentVer == 0 &&
 				 Cache[Start.TargetPkg()].Delete() == false &&
+				 (Flags[Start.TargetPkg()->ID] & ToRemove) != ToRemove &&
 				 Cache.GetCandidateVer(Start.TargetPkg()).end() == false)
 			{
 			   /* Before removing or keeping the package with the broken dependency

+ 4 - 1
debian/changelog

@@ -11,8 +11,11 @@ apt (0.8.9) UNRELEASED; urgency=low
   * apt-pkg/orderlist.cc:
     - try fixing before removing even if the fix is hidden in
       a provides, hidden in the #590438 testcase
+  * apt-pkg/algorithms.cc:
+    - if the package was explicitly marked as ToRemove don't
+      consider it as a candidate for FixByInstall
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 09 Nov 2010 14:16:41 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 10 Nov 2010 12:23:29 +0100
 
 apt (0.8.8) unstable; urgency=low