[maemo-commits] [maemo-commits] r16131 - projects/haf/trunk/apt

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-09-15 21:13:52 +0300 (Mon, 15 Sep 2008)
New Revision: 16131

Modified:
   projects/haf/trunk/apt/trusthook.patch
Log:
Updated.


Modified: projects/haf/trunk/apt/trusthook.patch
===================================================================
--- projects/haf/trunk/apt/trusthook.patch	2008-09-15 18:11:02 UTC (rev 16130)
+++ projects/haf/trunk/apt/trusthook.patch	2008-09-15 18:13:52 UTC (rev 16131)
@@ -1,8 +1,8 @@
 Index: apt-pkg/acquire-item.cc
 ===================================================================
---- apt-pkg/acquire-item.cc	(revision 14885)
+--- apt-pkg/acquire-item.cc	(revision 16129)
 +++ apt-pkg/acquire-item.cc	(working copy)
-@@ -1223,7 +1223,26 @@
+@@ -1217,6 +1217,25 @@ void pkgAcqMetaIndex::Failed(string Mess
  }
  
  									/*}}}*/
@@ -12,7 +12,7 @@
 +{
 +  return Index->IsTrusted ()? 1 : 0;
 +}
- 
++
 +static int (*index_trust_level_for_package) (pkgIndexFile *Index,
 +					      const pkgCache::VerIterator &Ver)
 +  = default_index_trust_level_for_package;
@@ -25,11 +25,10 @@
 +  index_trust_level_for_package = hook;
 +}
 +
-+
+ 
  // AcqArchive::AcqArchive - Constructor					/*{{{*/
  // ---------------------------------------------------------------------
- /* This just sets up the initial fetch environment and queues the first
-@@ -1232,8 +1251,8 @@
+@@ -1226,8 +1245,8 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire 
  			     pkgRecords *Recs,pkgCache::VerIterator const &Version,
  			     string &StoreFilename) :
                 Item(Owner), Version(Version), Sources(Sources), Recs(Recs), 
@@ -40,7 +39,7 @@
  {
     Retries = _config->FindI("Acquire::Retries",0);
  
-@@ -1249,6 +1268,9 @@
+@@ -1243,6 +1262,9 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire 
     /* We need to find a filename to determine the extension. We make the
        assumption here that all the available sources for this version share
        the same extension.. */
@@ -50,7 +49,7 @@
     // Skip not source sources, they do not have file fields.
     for (; Vf.end() == false; Vf++)
     {
-@@ -1272,31 +1294,62 @@
+@@ -1266,31 +1288,62 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire 
  	              "." + flExtension(Parse.FileName());
     }
  
@@ -91,7 +90,7 @@
 +              Vf++;
 +	       continue;
 +            }
- 
++
 +	   VerFileCandidates.push_back (Vf);
 +	   Vf++;
 +	 }
@@ -128,13 +127,13 @@
 +	   Vf++;
 +	 }
 +     }
-+
+ 
     // Select a source
 +   CurVerFile = VerFileCandidates.begin ();
     if (QueueNext() == false && _error->PendingError() == false)
        _error->Error(_("I wasn't able to locate file for the %s package. "
  		    "This might mean you need to manually fix this package."),
-@@ -1310,22 +1363,15 @@
+@@ -1304,22 +1357,15 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire 
     checking later. */
  bool pkgAcqArchive::QueueNext()
  {   
@@ -159,7 +158,7 @@
        // Grab the text package record
        pkgRecords::Parser &Parse = Recs->Lookup(Vf);
        if (_error->PendingError() == true)
-@@ -1403,7 +1449,6 @@
+@@ -1402,7 +1448,6 @@ bool pkgAcqArchive::QueueNext()
        Desc.ShortDesc = Version.ParentPkg().Name();
        QueueURI(Desc);
  
@@ -167,7 +166,7 @@
        return true;
     }
     return false;
-@@ -1480,7 +1525,7 @@
+@@ -1476,7 +1521,7 @@ void pkgAcqArchive::Failed(string Messag
         StringToBool(LookupTag(Message,"Transient-Failure"),false) == true)
     {
        // Vf = Version.FileList();
@@ -176,7 +175,7 @@
        StoreFilename = string();
        Item::Failed(Message,Cnf);
        return;
-@@ -1494,7 +1539,7 @@
+@@ -1490,7 +1535,7 @@ void pkgAcqArchive::Failed(string Messag
  	  StringToBool(LookupTag(Message,"Transient-Failure"),false) == true)
        {
  	 Retries--;
@@ -185,7 +184,7 @@
  	 if (QueueNext() == true)
  	    return;
        }
-@@ -1509,7 +1554,7 @@
+@@ -1505,7 +1550,7 @@ void pkgAcqArchive::Failed(string Messag
  // ---------------------------------------------------------------------
  bool pkgAcqArchive::IsTrusted()
  {
@@ -196,17 +195,17 @@
  // AcqArchive::Finished - Fetching has finished, tidy up		/*{{{*/
 Index: apt-pkg/acquire-item.h
 ===================================================================
---- apt-pkg/acquire-item.h	(revision 14885)
+--- apt-pkg/acquire-item.h	(revision 16129)
 +++ apt-pkg/acquire-item.h	(working copy)
-@@ -27,6 +27,7 @@
- #include <apt-pkg/pkgrecords.h>
- #include <apt-pkg/indexrecords.h>
+@@ -614,6 +614,7 @@ class pkgAcqMetaSig : public pkgAcquire:
+    /** \brief The last good signature file */
+    string LastGoodSig;
  
 +#include <list>
  
- /** \addtogroup acquire
-  *  @{
-@@ -787,8 +788,8 @@
+    /** \brief The fetch request that is currently being processed. */
+    pkgAcquire::ItemDesc Desc;
+@@ -792,8 +793,8 @@ class pkgAcqArchive : public pkgAcquire:
      */
     string &StoreFilename;
  
@@ -217,7 +216,7 @@
  
     /** \brief How many (more) times to try to find a new source from
      *  which to download this package version if it fails.
-@@ -797,10 +798,10 @@
+@@ -802,10 +803,10 @@ class pkgAcqArchive : public pkgAcquire:
      */
     unsigned int Retries;
  
@@ -230,7 +229,7 @@
  
     /** \brief Queue up the next available file for this version. */
     bool QueueNext();
-@@ -904,4 +905,28 @@
+@@ -908,4 +909,28 @@ class pkgAcqFile : public pkgAcquire::It
  
  /** @} */