X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/8e5fc8f5bea54e3c016a14fe4025dcb94864e874..1db7d3928e37662a6f29fe1cff8dcec38ad93319:/apt-pkg/acquire-worker.cc

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index f6b14da3c..a2f970ab6 100644
--- 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.28 1999/10/18 00:37:35 jgg Exp $
+// $Id: acquire-worker.cc,v 1.31 2000/05/10 05:56:46 jgg Exp $
 /* ######################################################################
 
    Acquire Worker 
@@ -117,7 +117,7 @@ bool pkgAcquire::Worker::Start()
       return false;
    }
    for (int I = 0; I != 4; I++)
-      SetCloseExec(Pipes[0],true);
+      SetCloseExec(Pipes[I],true);
    
    // Fork off the process
    Process = ExecFork();
@@ -233,6 +233,10 @@ bool pkgAcquire::Worker::RunMessages()
 	    ResumePoint = atoi(LookupTag(Message,"Resume-Point","0").c_str());
 	    Itm->Owner->Start(Message,atoi(LookupTag(Message,"Size","0").c_str()));
 
+	    // Display update before completion
+	    if (Log != 0 && Log->MorePulses == true)
+	       Log->Pulse(Itm->Owner->GetOwner());
+	    
 	    if (Log != 0)
 	       Log->Fetch(*Itm);
 
@@ -247,9 +251,14 @@ bool pkgAcquire::Worker::RunMessages()
 	       _error->Error("Method gave invalid 201 URI Done message");
 	       break;
 	    }
-
+	    
 	    pkgAcquire::Item *Owner = Itm->Owner;
 	    pkgAcquire::ItemDesc Desc = *Itm;
+	    
+	    // Display update before completion
+	    if (Log != 0 && Log->MorePulses == true)
+	       Log->Pulse(Owner->GetOwner());
+	    
 	    OwnerQ->ItemDone(Itm);
 	    if (TotalSize != 0 && 
 		(unsigned)atoi(LookupTag(Message,"Size","0").c_str()) != TotalSize)
@@ -257,7 +266,7 @@ bool pkgAcquire::Worker::RunMessages()
 			       LookupTag(Message,"Size","0").c_str(),TotalSize);
 
 	    Owner->Done(Message,atoi(LookupTag(Message,"Size","0").c_str()),
-			LookupTag(Message,"MD5-Hash"));
+			LookupTag(Message,"MD5-Hash"),Config);
 	    ItemDone();
 	    
 	    // Log that we are done
@@ -286,6 +295,10 @@ bool pkgAcquire::Worker::RunMessages()
 	       break;
 	    }
 
+	    // Display update before completion
+	    if (Log != 0 && Log->MorePulses == true)
+	       Log->Pulse(Itm->Owner->GetOwner());
+	    
 	    pkgAcquire::Item *Owner = Itm->Owner;
 	    pkgAcquire::ItemDesc Desc = *Itm;
 	    OwnerQ->ItemDone(Itm);
@@ -327,15 +340,19 @@ bool pkgAcquire::Worker::Capabilities(string Message)
    Config->SendConfig = StringToBool(LookupTag(Message,"Send-Config"),false);
    Config->LocalOnly = StringToBool(LookupTag(Message,"Local-Only"),false);
    Config->NeedsCleanup = StringToBool(LookupTag(Message,"Needs-Cleanup"),false);
+   Config->Removable = StringToBool(LookupTag(Message,"Removable"),false);
 
    // Some debug text
    if (Debug == true)
    {
       clog << "Configured access method " << Config->Access << endl;
-      clog << "Version:" << Config->Version << " SingleInstance:" <<
-	 Config->SingleInstance << 
-	 " Pipeline:" << Config->Pipeline << " SendConfig:" << 
-	 Config->SendConfig << endl;
+      clog << "Version:" << Config->Version <<
+	      " SingleInstance:" << Config->SingleInstance <<
+	      " Pipeline:" << Config->Pipeline << 
+	      " SendConfig:" << Config->SendConfig << 
+	      " LocalOnly: " << Config->LocalOnly << 
+	      " NeedsCleanup: " << Config->NeedsCleanup << 
+	      " Removable: " << Config->Removable << endl;
    }
    
    return true;