* 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 58c915344dc0e90a30cc5933ba77a85c5685ff76..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>
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/acquire-item.h"
-#endif 
 
 /** \addtogroup acquire
  *  @{
@@ -100,7 +97,12 @@ class pkgAcquire::Item
        /** \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
@@ -691,13 +693,15 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
    /** \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.
     */
-   bool VerifyVendor();
+   bool VerifyVendor(string Message);
 
    /** \brief Called when a file is finished being retrieved.
     *