// -*- 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.32 2001/02/20 07:03:17 jgg Exp $
/* ######################################################################
Acquire Worker
#include <apt-pkg/configuration.h>
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
-#include <strutl.h>
+#include <apt-pkg/strutl.h>
+#include <apti18n.h>
+
#include <sys/stat.h>
#include <unistd.h>
+#include <fcntl.h>
#include <signal.h>
-#include <wait.h>
#include <stdio.h>
+#include <errno.h>
/*}}}*/
// Worker::Worker - Constructor for Queue startup /*{{{*/
Config = Cnf;
Access = Cnf->Access;
CurrentItem = 0;
-
+ TotalSize = 0;
+ CurrentSize = 0;
+
Construct();
}
/*}}}*/
Config = Cnf;
Access = Cnf->Access;
CurrentItem = 0;
+ TotalSize = 0;
+ CurrentSize = 0;
Construct();
}
if (Process > 0)
{
- kill(Process,SIGINT);
- if (waitpid(Process,0,0) != Process)
- _error->Warning("I waited but nothing was there!");
+ /* Closing of stdin is the signal to exit and die when the process
+ indicates it needs cleanup */
+ if (Config->NeedsCleanup == false)
+ kill(Process,SIGINT);
+ ExecWait(Process,Access.c_str(),true);
}
}
/*}}}*/
// Get the method path
string Method = _config->FindDir("Dir::Bin::Methods") + Access;
if (FileExists(Method) == false)
- return _error->Error("The method driver %s could not be found.",Method.c_str());
+ return _error->Error(_("The method driver %s could not be found."),Method.c_str());
if (Debug == true)
clog << "Starting method '" << Method << '\'' << endl;
return false;
}
for (int I = 0; I != 4; I++)
- SetCloseExec(Pipes[0],true);
+ SetCloseExec(Pipes[I],true);
// Fork off the process
- Process = fork();
- if (Process < 0)
- {
- cerr << "FATAL -> Failed to fork." << endl;
- exit(100);
- }
+ Process = ExecFork();
// Spawn the subprocess
if (Process == 0)
Args[1] = 0;
execv(Args[0],(char **)Args);
cerr << "Failed to exec method " << Args[0] << endl;
- exit(100);
+ _exit(100);
}
// Fix up our FDs
// Read the configuration data
if (WaitFd(InFd) == false ||
ReadMessages() == false)
- return _error->Error("Method %s did not start correctly",Method.c_str());
+ return _error->Error(_("Method %s did not start correctly"),Method.c_str());
RunMessages();
if (OwnerQ != 0)
CurrentItem = Itm;
CurrentSize = 0;
TotalSize = atoi(LookupTag(Message,"Size","0").c_str());
+ 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);
_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)
+ _error->Warning("Bizarre Error - File size is not what the server reported %s %lu",
+ 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
{
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);
- }
+ }
break;
}
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);
- Owner->Failed(Message);
+ Owner->Failed(Message,Config);
ItemDone();
-
+
if (Log != 0)
Log->Fail(Desc);
-
+
break;
}
// 401 General Failure
case 401:
- _error->Error("Method %s General failure: %s",LookupTag(Message,"Message").c_str());
+ _error->Error("Method %s General failure: %s",Access.c_str(),LookupTag(Message,"Message").c_str());
break;
// 403 Media Change
Config->Pipeline = StringToBool(LookupTag(Message,"Pipeline"),false);
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;
{
if (Top->Value.empty() == false)
{
- string Line = "Config-Item: " + Top->FullTag() + "=";
+ string Line = "Config-Item: " + QuoteString(Top->FullTag(),"=\"\n") + "=";
Line += QuoteString(Top->Value,"\n") + '\n';
Message += Line;
}
/* */
bool pkgAcquire::Worker::OutFdReady()
{
- int Res = write(OutFd,OutQueue.begin(),OutQueue.length());
+ int Res;
+ do
+ {
+ Res = write(OutFd,OutQueue.begin(),OutQueue.length());
+ }
+ while (Res < 0 && errno == EINTR);
+
if (Res <= 0)
return MethodFailure();
{
_error->Error("Method %s has died unexpectedly!",Access.c_str());
- if (waitpid(Process,0,0) != Process)
- _error->Warning("I waited but nothing was there!");
+ ExecWait(Process,Access.c_str(),true);
Process = -1;
close(InFd);
close(OutFd);
if (stat(CurrentItem->Owner->DestFile.c_str(),&Buf) != 0)
return;
CurrentSize = Buf.st_size;
+
+ // Hmm? Should not happen...
+ if (CurrentSize > TotalSize && TotalSize != 0)
+ TotalSize = CurrentSize;
}
/*}}}*/
// Worker::ItemDone - Called when the current item is finished /*{{{*/
projects / apt.git / blobdiff