Minor fixes

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

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 28f8408b6ab8b1c01d879be09bda4b6a9e5f8368..099a43e2ec214142ef878d047039cab7f20935a9 100644 (file)
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: acquire-worker.cc,v 1.15 1998/12/05 01:45:20 jgg Exp $
+// $Id: acquire-worker.cc,v 1.19 1999/01/30 08:08:54 jgg Exp $
 /* ######################################################################
 
    Acquire Worker 
@@ -20,7 +20,7 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
-#include <strutl.h>
+#include <apt-pkg/strutl.h>
 
 #include <sys/stat.h>
 #include <unistd.h>
@@ -136,7 +136,7 @@ bool pkgAcquire::Worker::Start()
       Args[1] = 0;
       execv(Args[0],(char **)Args);
       cerr << "Failed to exec method " << Args[0] << endl;
-      exit(100);
+      _exit(100);
    }
 
    // Fix up our FDs
@@ -257,7 +257,12 @@ bool pkgAcquire::Worker::RunMessages()
            {
               if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true ||
                   StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false) == true)
-                 Log->IMSHit(Desc);
+              {
+                 /* Hide 'hits' for local only sources - we also manage to
+                    hide gets */
+                 if (Config->LocalOnly == false)
+                    Log->IMSHit(Desc);
+              }               
               else
                  Log->Done(Desc);
            }       
@@ -276,12 +281,12 @@ bool pkgAcquire::Worker::RunMessages()
            pkgAcquire::Item *Owner = Itm->Owner;
            pkgAcquire::ItemDesc Desc = *Itm;
            OwnerQ->ItemDone(Itm);
-           Owner->Failed(Message);
+           Owner->Failed(Message,Config);
            ItemDone();
-           
+
            if (Log != 0)
               Log->Fail(Desc);
-           
+
            break;
         }