allow individual targets to be kept compressed

[apt.git] / apt-pkg / acquire-worker.cc

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 55fa5734fad77a372497e32383395a1284e5b96d..c0f93f9ce5305a9e1f44afe808135e187f98402a 100644 (file)
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -47,7 +47,7 @@ using namespace std;
 // ---------------------------------------------------------------------
 /* */
 pkgAcquire::Worker::Worker(Queue *Q,MethodConfig *Cnf,
 // ---------------------------------------------------------------------
 /* */
 pkgAcquire::Worker::Worker(Queue *Q,MethodConfig *Cnf,

-                          pkgAcquireStatus *log) : Log(log)
+                          pkgAcquireStatus *log) : d(NULL), Log(log)

 {
    OwnerQ = Q;
    Config = Cnf;
 {
    OwnerQ = Q;
    Config = Cnf;


@@ -62,15 +62,10 @@ pkgAcquire::Worker::Worker(Queue *Q,MethodConfig *Cnf,
 // Worker::Worker - Constructor for method config startup              /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Worker::Worker - Constructor for method config startup              /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-pkgAcquire::Worker::Worker(MethodConfig *Cnf)
+pkgAcquire::Worker::Worker(MethodConfig *Cnf) : d(NULL), OwnerQ(NULL), Config(Cnf),
+                                               Access(Cnf->Access), CurrentItem(NULL),
+                                               CurrentSize(0), TotalSize(0)

 {
 {

-   OwnerQ = 0;
-   Config = Cnf;
-   Access = Cnf->Access;
-   CurrentItem = 0;
-   TotalSize = 0;
-   CurrentSize = 0;
-

    Construct();
 }
                                                                        /*}}}*/
    Construct();
 }
                                                                        /*}}}*/


@@ -727,7 +722,7 @@ void pkgAcquire::Worker::PrepareFiles(char const * const caller, pkgAcquire::Que
         unlink(Owner->DestFile.c_str());
         if (link(filename.c_str(), Owner->DestFile.c_str()) != 0)
         {
         unlink(Owner->DestFile.c_str());
         if (link(filename.c_str(), Owner->DestFile.c_str()) != 0)
         {

-           // diferent mounts can't happen for us as we download to lists/ by default,
+           // different mounts can't happen for us as we download to lists/ by default,

            // but if the system is reused by others the locations can potentially be on
            // different disks, so use symlink as poor-men replacement.
            // FIXME: Real copying as last fallback, but that is costly, so offload to a method preferable
            // but if the system is reused by others the locations can potentially be on
            // different disks, so use symlink as poor-men replacement.
            // FIXME: Real copying as last fallback, but that is costly, so offload to a method preferable