* merged apt--curl-https branch

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

diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 323dff2564461a67f106055cecac868e054cbc8f..f5272ed8623f4562d521417f0f55b8a2e77d9371 100644 (file)
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -27,9 +27,6 @@
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/indexrecords.h>
 
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/indexrecords.h>
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/acquire-item.h"
-#endif 

 
 /** \addtogroup acquire
  *  @{
 
 /** \addtogroup acquire
  *  @{


@@ -100,7 +97,12 @@ class pkgAcquire::Item
        /** \brief The item was downloaded but its authenticity could
        *  not be verified.
        */
        /** \brief The item was downloaded but its authenticity could
        *  not be verified.
        */

-       StatAuthError
+       StatAuthError,
+
+       /** \brief The item was could not be downloaded because of 
+       *  a transient network error (e.g. network down)
+       */
+       StatTransientNetworkError

      } Status;
 
    /** \brief Contains a textual description of the error encountered
      } Status;
 
    /** \brief Contains a textual description of the error encountered


@@ -691,13 +693,15 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
    /** \brief If \b true, the index's signature is currently being verified.
     */
    bool AuthPass;
    /** \brief If \b true, the index's signature is currently being verified.
     */
    bool AuthPass;

+   // required to deal gracefully with problems caused by incorrect ims hits
+   bool IMSHit; 

 
    /** \brief Check that the release file is a release file for the
     *  correct distribution.
     *
     *  \return \b true if no fatal errors were encountered.
     */
 
    /** \brief Check that the release file is a release file for the
     *  correct distribution.
     *
     *  \return \b true if no fatal errors were encountered.
     */

-   bool VerifyVendor();
+   bool VerifyVendor(string Message);

 
    /** \brief Called when a file is finished being retrieved.
     *
 
    /** \brief Called when a file is finished being retrieved.
     *


@@ -878,9 +882,21 @@ class pkgAcqFile : public pkgAcquire::Item
     *
     *  \param ShortDesc A brief description of the file being
     *  downloaded.
     *
     *  \param ShortDesc A brief description of the file being
     *  downloaded.

+    *
+    *  \param DestDir The directory the file should be downloaded into.
+    *
+    *  \param DestFilename The filename+path the file is downloaded to.
+    *
+    *
+    * If DestFilename is empty, download to DestDir/<basename> if
+    * DestDir is non-empty, $CWD/<basename> otherwise.  If
+    * DestFilename is NOT empty, DestDir is ignored and DestFilename
+    * is the absolute name to which the file should be downloaded.

     */
     */

-   pkgAcqFile(pkgAcquire *Owner,string URI,string MD5,unsigned long Size,
-                 string Desc,string ShortDesc);
+
+   pkgAcqFile(pkgAcquire *Owner, string URI, string MD5, unsigned long Size,
+             string Desc, string ShortDesc,
+             const string &DestDir="", const string &DestFilename="");

 };
 
 /** @} */
 };
 
 /** @} */