use the portable timegm shown in his manpage instead of a strange

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

diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 6c130c1b32163d9ce5bb535960fec118bb60eef0..8e2c21151af135fd9b7c6c19dfdff3ffd663174a 100644 (file)
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -66,6 +66,9 @@
 #ifndef PKGLIB_ACQUIRE_H
 #define PKGLIB_ACQUIRE_H
 
 #ifndef PKGLIB_ACQUIRE_H
 #define PKGLIB_ACQUIRE_H
 

+#include <apt-pkg/macros.h>
+#include <apt-pkg/weakptr.h>
+

 #include <vector>
 #include <string>
 
 #include <vector>
 #include <string>
 


@@ -161,7 +164,7 @@ class pkgAcquire
      QueueAccess} QueueMode;
 
    /** \brief If \b true, debugging information will be dumped to std::clog. */
      QueueAccess} QueueMode;
 
    /** \brief If \b true, debugging information will be dumped to std::clog. */

-   bool Debug;
+   bool const Debug;

    /** \brief If \b true, a download is currently in progress. */
    bool Running;
 
    /** \brief If \b true, a download is currently in progress. */
    bool Running;
 


@@ -332,15 +335,22 @@ class pkgAcquire
     */
    double PartialPresent();
 
     */
    double PartialPresent();
 

-   /** \brief Construct a new pkgAcquire.
+   /** \brief Delayed constructor

     *
     *

-    *  \param Log The progress indicator associated with this
-    *  download, or \b NULL for none.  This object is not owned by the
+    *  \param Progress indicator associated with this download or
+    *  \b NULL for none.  This object is not owned by the

     *  download process and will not be deleted when the pkgAcquire
     *  object is destroyed.  Naturally, it should live for at least as
     *  long as the pkgAcquire object does.
     *  download process and will not be deleted when the pkgAcquire
     *  object is destroyed.  Naturally, it should live for at least as
     *  long as the pkgAcquire object does.

+    *  \param Lock defines a lock file that should be acquired to ensure
+    *  only one Acquire class is in action at the time or an empty string
+    *  if no lock file should be used.

     */
     */

-   pkgAcquire(pkgAcquireStatus *Log = 0);
+   bool Setup(pkgAcquireStatus *Progress = NULL, string const &Lock = "");
+
+   /** \brief Construct a new pkgAcquire. */
+   pkgAcquire(pkgAcquireStatus *Log) __deprecated;
+   pkgAcquire();

 
    /** \brief Destroy this pkgAcquire object.
     *
 
    /** \brief Destroy this pkgAcquire object.
     *


@@ -348,6 +358,18 @@ class pkgAcquire
     *  this download.
     */
    virtual ~pkgAcquire();
     *  this download.
     */
    virtual ~pkgAcquire();

+
+   private:
+   /** \brief FD of the Lock file we acquire in Setup (if any) */
+   int LockFD;
+
+   /** \brief Ensure the existence of the given Path
+    *
+    *  \param Parent directory of the Path directory - a trailing
+    *  /apt/ will be removed before CreateDirectory call.
+    *  \param Path which should exist after (successful) call
+    */
+   bool CheckDirectory(string const &Parent, string const &Path) const;

 };
 
 /** \brief Represents a single download source from which an item
 };
 
 /** \brief Represents a single download source from which an item


@@ -355,7 +377,7 @@ class pkgAcquire
  *
  *  An item may have several assocated ItemDescs over its lifetime.
  */
  *
  *  An item may have several assocated ItemDescs over its lifetime.
  */

-struct pkgAcquire::ItemDesc
+struct pkgAcquire::ItemDesc : public WeakPointable

 {
    /** \brief The URI from which to download this item. */
    string URI;
 {
    /** \brief The URI from which to download this item. */
    string URI;