[maemo-commits] [maemo-commits] r11405 - in projects/haf/trunk/apt: . apt-pkg

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-05-03 14:56:02 +0300 (Thu, 03 May 2007)
New Revision: 11405

Modified:
   projects/haf/trunk/apt/apt-pkg/acquire-item.cc
   projects/haf/trunk/apt/trusthook.patch
Log:
apt (0.6.46.4.osso6) unstable; urgency=low

  * Bugfixed trusthook.patch to not get into infinite loops in certain
    cases.

 -- Marius Vollmer <marius.vollmer at nokia.com>  Thu,  3 May 2007 14:18:47 +0300


Modified: projects/haf/trunk/apt/apt-pkg/acquire-item.cc
===================================================================
--- projects/haf/trunk/apt/apt-pkg/acquire-item.cc	2007-05-03 11:44:54 UTC (rev 11404)
+++ projects/haf/trunk/apt/apt-pkg/acquire-item.cc	2007-05-03 11:56:02 UTC (rev 11405)
@@ -1334,7 +1334,11 @@
        while (!Vf.end())
 	 {
 	   if ((Vf.File()->Flags & pkgCache::Flag::NotSource) != 0)
-	     continue;
+	     {
+	       Vf++;
+	       continue;
+	     }
+
 	   VerFileCandidates.push_back (Vf);
 	   Vf++;
 	 }
@@ -1347,7 +1351,10 @@
 	 {
 	   pkgIndexFile *Index;
 	   if (Sources->FindIndex(Vf.File(),Index) == false)
-	     continue;
+	     {
+	       Vf++;
+	       continue;
+	     }
        
 	   int l = index_trust_level_for_package (Index, Version);
 	   

Modified: projects/haf/trunk/apt/trusthook.patch
===================================================================
--- projects/haf/trunk/apt/trusthook.patch	2007-05-03 11:44:54 UTC (rev 11404)
+++ projects/haf/trunk/apt/trusthook.patch	2007-05-03 11:56:02 UTC (rev 11405)
@@ -50,7 +50,7 @@
     // Skip not source sources, they do not have file fields.
     for (; Vf.end() == false; Vf++)
     {
-@@ -1300,31 +1322,55 @@
+@@ -1300,31 +1322,62 @@
  	              "." + flExtension(Parse.FileName());
     }
  
@@ -87,7 +87,11 @@
 +       while (!Vf.end())
 +	 {
 +	   if ((Vf.File()->Flags & pkgCache::Flag::NotSource) != 0)
-+	     continue;
++            {
++              Vf++;
++	       continue;
++            }
++
 +	   VerFileCandidates.push_back (Vf);
 +	   Vf++;
 +	 }
@@ -100,7 +104,10 @@
 +	 {
 +	   pkgIndexFile *Index;
 +	   if (Sources->FindIndex(Vf.File(),Index) == false)
-+	     continue;
++            {
++              Vf++;
++	       continue;
++            }
 +       
 +	   int l = index_trust_level_for_package (Index, Version);
 +