From 59194959326dbf114a5c894e4279c04844b4a793 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Thu, 22 May 2014 17:47:22 +0200
Subject: [PATCH] move ByHash into its own function

---
 apt-pkg/acquire-item.cc | 60 +++++++++++++++++++++++------------------
 apt-pkg/acquire-item.h  |  3 +++
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index b7ca82c0c..e111ed4ca 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1018,32 +1018,8 @@ void pkgAcqIndex::Init(string const &URI, string const &URIDesc, string const &S
       indexRecords::checkSum *Record = MetaIndexParser->Lookup(MetaKey);
       if(Record)
          FileSize = Record->Size;
-
-      // TODO:
-      //  - (maybe?) add support for by-hash into the sources.list as flag
-      //  - make apt-ftparchive generate the hashes (and expire?)
-      // do the request by-hash
-      std::string HostKnob = "APT::Acquire::" + ::URI(URI).Host + "::By-Hash";
-      if(_config->FindB("APT::Acquire::By-Hash", false) == true ||
-         _config->FindB(HostKnob, false) == true ||
-         MetaIndexParser->GetSupportsAcquireByHash())
-      {
-         indexRecords::checkSum *Record = MetaIndexParser->Lookup(MetaKey);
-         if(Record)
-         {
-            // FIXME: should we really use the best hash here? or a fixed one?
-            const HashString *TargetHash = Record->Hashes.find("");
-            std::string ByHash = "/by-hash/" + TargetHash->HashType() + "/" + TargetHash->HashValue();
-            size_t trailing_slash = Desc.URI.find_last_of("/");
-            Desc.URI = Desc.URI.replace(
-               trailing_slash,
-               Desc.URI.substr(trailing_slash+1).size()+1,
-               ByHash);
-         } else {
-            _error->Warning("By-Hash requested but can not find record for %s",
-                            MetaKey.c_str());
-         }
-      }
+      
+      InitByHashIfNeeded(MetaKey);
    }
 
    Desc.Description = URIDesc;
@@ -1053,6 +1029,38 @@ void pkgAcqIndex::Init(string const &URI, string const &URIDesc, string const &S
    QueueURI(Desc);
 }
 									/*}}}*/
+// AcqIndex::AdjustForByHash - modify URI for by-hash support		/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void pkgAcqIndex::InitByHashIfNeeded(const std::string MetaKey)
+{
+   // TODO:
+   //  - (maybe?) add support for by-hash into the sources.list as flag
+   //  - make apt-ftparchive generate the hashes (and expire?)
+   std::string HostKnob = "APT::Acquire::" + ::URI(Desc.URI).Host + "::By-Hash";
+   if(_config->FindB("APT::Acquire::By-Hash", false) == true ||
+      _config->FindB(HostKnob, false) == true ||
+      MetaIndexParser->GetSupportsAcquireByHash())
+   {
+      indexRecords::checkSum *Record = MetaIndexParser->Lookup(MetaKey);
+      if(Record)
+      {
+         // FIXME: should we really use the best hash here? or a fixed one?
+         const HashString *TargetHash = Record->Hashes.find("");
+         std::string ByHash = "/by-hash/" + TargetHash->HashType() + "/" + TargetHash->HashValue();
+         size_t trailing_slash = Desc.URI.find_last_of("/");
+         Desc.URI = Desc.URI.replace(
+            trailing_slash,
+            Desc.URI.substr(trailing_slash+1).size()+1,
+            ByHash);
+      } else {
+         _error->Warning(
+            "Fetching ByHash requested but can not find record for %s",
+            MetaKey.c_str());
+      }
+   }
+}
+									/*}}}*/
 // AcqIndex::Custom600Headers - Insert custom request headers		/*{{{*/
 // ---------------------------------------------------------------------
 /* The only header we use is the last-modified header. */
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 3d863874c..cda92e84f 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -713,6 +713,9 @@ class pkgAcqIndex : public pkgAcqBaseIndex
     */
    std::string CompressionExtension;
 
+   /** \brief Do the changes needed to fetch via AptByHash (if needed) */
+   void InitByHashIfNeeded(const std::string MetaKey);
+
    public:
    
    // Specialized action members
-- 
2.45.2