From: Michael Vogt <egon@tas>
Date: Mon, 18 Dec 2006 18:39:42 +0000 (+0100)
Subject: * apt-pkg/algorithms.cc:
X-Git-Tag: 0.7.24ubuntu1~210^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/4172c78468a04078c97146dbc2e2979e63906f5b?hp=-c

* apt-pkg/algorithms.cc:
  - only increase the score of installed applications if they are not
    obsolte (still downloadable)
---

4172c78468a04078c97146dbc2e2979e63906f5b
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 8d1e4e8e8..0d486d102 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -494,8 +494,10 @@ void pkgProblemResolver::MakeScores()
 	 Score += PrioMap[Cache[I].InstVerIter(Cache)->Priority];
       
       /* This helps to fix oddball problems with conflicting packages
-         on the same level. We enhance the score of installed packages */
-      if (I->CurrentVer != 0)
+         on the same level. We enhance the score of installed packages 
+	 if those are not obsolete
+      */
+      if (I->CurrentVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable())
 	 Score += 1;
    }
 
diff --git a/debian/changelog b/debian/changelog
index 127c5fd83..06cede531 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-apt (0.6.46.5) unstable; urgency=low
+apt (0.6.46.5) UNRELEASED; urgency=low
 
   * apt-pkg/algorithm.cc:
     - use clog for all debugging
+    - only increase the score of installed applications if they 
+      are not obsolete 
 
- --
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
 
 apt (0.6.46.4) unstable; urgency=high