diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:54:23 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:54:23 +0000 |
| commit | ddc1d8d08eaff6c71c6062654ddd9d8981799ae9 (patch) | |
| tree | 745d470d679bf169cab6da3f3322f40121e1f81c /apt-pkg/acquire-worker.cc | |
| parent | 727f18afe9c2eec15ee446cb667d9561644b5bf6 (diff) | |
Minor cleanups, fix for checksum lowercase bug
Author: jgg
Date: 1999-07-26 17:46:07 GMT
Minor cleanups, fix for checksum lowercase bug
Diffstat (limited to 'apt-pkg/acquire-worker.cc')
| -rw-r--r-- | apt-pkg/acquire-worker.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 29d5cd9d5..6d70e79d8 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.22 1999/05/23 06:47:43 jgg Exp $ +// $Id: acquire-worker.cc,v 1.23 1999/07/26 17:46:07 jgg Exp $ /* ###################################################################### Acquire Worker @@ -26,7 +26,6 @@ #include <unistd.h> #include <fcntl.h> #include <signal.h> -#include <wait.h> #include <stdio.h> #include <errno.h> /*}}}*/ @@ -84,8 +83,7 @@ pkgAcquire::Worker::~Worker() if (Process > 0) { kill(Process,SIGINT); - if (waitpid(Process,0,0) != Process) - _error->Warning("I waited but nothing was there!"); + ExecWait(Process,Access.c_str(),true); } } /*}}}*/ @@ -471,8 +469,7 @@ bool pkgAcquire::Worker::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); |