diff options
| -rw-r--r-- | cmdline/apt-get.cc | 4 | ||||
| -rw-r--r-- | methods/http.cc | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index ddf02a8f3..585026aba 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-get.cc,v 1.62 1999/06/04 02:31:37 jgg Exp $ +// $Id: apt-get.cc,v 1.63 1999/06/05 07:30:18 jgg Exp $ /* ###################################################################### apt-get - Cover for dpkg @@ -618,7 +618,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,bool Saftey = if (_config->FindB("APT::Get::Download-Only",false) == true) { - if (Failed == false && _config->FindB("APT::Get::Fix-Missing",false) == false) + if (Failed == true && _config->FindB("APT::Get::Fix-Missing",false) == false) return _error->Error("Some files failed to download"); return true; } diff --git a/methods/http.cc b/methods/http.cc index f014193a0..0a7f04a4f 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: http.cc,v 1.34 1999/05/29 03:25:03 jgg Exp $ +// $Id: http.cc,v 1.35 1999/06/05 07:30:18 jgg Exp $ /* ###################################################################### HTTP Aquire Method - This is the HTTP aquire method for APT. @@ -643,7 +643,8 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) bool HttpMethod::Go(bool ToFile,ServerState *Srv) { // Server has closed the connection - if (Srv->ServerFd == -1 && Srv->In.WriteSpace() == false) + if (Srv->ServerFd == -1 && (Srv->In.WriteSpace() == false || + ToFile == false)) return false; fd_set rfds,wfds,efds; @@ -678,7 +679,7 @@ bool HttpMethod::Go(bool ToFile,ServerState *Srv) int MaxFd = FileFD; if (MaxFd < Srv->ServerFd) MaxFd = Srv->ServerFd; - + // Select struct timeval tv; tv.tv_sec = TimeOut; @@ -1016,7 +1017,7 @@ int HttpMethod::Loop() if (FailCounter >= 2) { - Fail("Connection timed out",true); + Fail("Connection failed",true); FailCounter = 0; } |