* apt-pkg/depcache.cc:

  - "reinstall" the correct version for a killed pseudo package

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 75f69ee116a13b3c88ae7e0ce77ff9642830b2a8..0f07de2fea80068ec2ea2048e1c74bd01e67b5af 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -855,13 +855,16 @@ void pkgDepCache::Update(OpProgress *Prog)
               if (P.end() == true) continue;
               for (VerIterator V = P.VersionList(); V.end() != true; ++V)
               {
-                 // FIXME: String comparison isn't a save indicator!
-                 if (strcmp(allV.VerStr(),V.VerStr()) != 0)
+                 if (allV->Hash != V->Hash ||
+                     strcmp(allV.VerStr(),V.VerStr()) != 0)
                     continue;
                  unsigned char const CurDepState = VersionState(V.DependsList(),DepInstall,DepInstMin,DepInstPolicy);
                  if ((CurDepState & DepInstMin) != DepInstMin)
                     break; // we found the correct version, but it is broken. Better try another arch or later again
+                 RemoveSizes(P);
+                 RemoveStates(P);
                  P->CurrentVer = V.Index();
+                 PkgState[P->ID].InstallVer = V;
                  AddStates(P);
                  Update(P);
                  AddSizes(P);

diff --git a/debian/changelog b/debian/changelog
index edc82e1d794bc985c4ca7f18e49436248c13a23c..16800a9d189b4d00f616c4fd9f9722c0f7cd1577 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.7.26~exp4) experimental; urgency=low
+
+  * apt-pkg/depcache.cc:
+    - "reinstall" the correct version for a killed pseudo package
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 03 Apr 2010 14:58:39 +0200
+
 apt (0.7.26~exp3) experimental; urgency=low
 
   [ Christian Perrier ]