Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-pkg / acquire-item.h

diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 3d863874cdc1e9dad16e81f570197a870e49c8f4..bf12e48c897083eb3801bc1cd80831de3c9e8329 100644 (file)
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -289,7 +289,8 @@ class pkgAcquire::Item : public WeakPointable
     *  \param Owner The new owner of this item.
     *  \param ExpectedHashes of the file represented by this item
     */
     *  \param Owner The new owner of this item.
     *  \param ExpectedHashes of the file represented by this item
     */

-   Item(pkgAcquire *Owner, HashStringList const &ExpectedHashes);
+   Item(pkgAcquire *Owner,
+        HashStringList const &ExpectedHashes=HashStringList());

 
    /** \brief Remove this item from its owner's queue by invoking
     *  pkgAcquire::Remove.
 
    /** \brief Remove this item from its owner's queue by invoking
     *  pkgAcquire::Remove.


@@ -713,6 +714,9 @@ class pkgAcqIndex : public pkgAcqBaseIndex
     */
    std::string CompressionExtension;
 
     */
    std::string CompressionExtension;
 

+   /** \brief Do the changes needed to fetch via AptByHash (if needed) */
+   void InitByHashIfNeeded(const std::string MetaKey);
+

    public:
    
    // Specialized action members
    public:
    
    // Specialized action members


@@ -745,7 +749,7 @@ class pkgAcqIndex : public pkgAcqBaseIndex
               std::string ShortDesc, HashStringList const &ExpectedHashes,
               std::string compressExt="");
    pkgAcqIndex(pkgAcquire *Owner,
               std::string ShortDesc, HashStringList const &ExpectedHashes,
               std::string compressExt="");
    pkgAcqIndex(pkgAcquire *Owner,

-               struct IndexTarget const * const Target,
+               IndexTarget const * const Target,

                HashStringList const &ExpectedHash,
                indexRecords *MetaIndexParser);
    void Init(std::string const &URI, std::string const &URIDesc,
                HashStringList const &ExpectedHash,
                indexRecords *MetaIndexParser);
    void Init(std::string const &URI, std::string const &URIDesc,