diff options
| author | Michael Vogt <mvo@debian.org> | 2011-05-16 15:57:52 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2011-05-16 15:57:52 +0200 |
| commit | d44b706c2d5964daaaf55e6eb97845827958f6e3 (patch) | |
| tree | b77f6e72c34c2444ec28e2d47430211d802efb4b /apt-pkg/acquire-worker.cc | |
| parent | 9c192d2811c12dcaf607024eb7f0677b011194e6 (diff) | |
| parent | d77b985a309c379d4978525172a72b728fecd15e (diff) | |
merged from lp:~donkult/apt/sid
Diffstat (limited to 'apt-pkg/acquire-worker.cc')
| -rw-r--r-- | apt-pkg/acquire-worker.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index ddd8e3101..75e03232a 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -287,10 +287,10 @@ bool pkgAcquire::Worker::RunMessages() 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); + unsigned long const ServerSize = atol(LookupTag(Message,"Size","0").c_str()); + if (TotalSize != 0 && ServerSize != TotalSize) + _error->Warning("Size of file %s is not what the server reported %s %lu", + Owner->DestFile.c_str(), LookupTag(Message,"Size","0").c_str(),TotalSize); // see if there is a hash to verify string RecivedHash; @@ -309,8 +309,7 @@ bool pkgAcquire::Worker::RunMessages() << endl << endl; } } - Owner->Done(Message,atoi(LookupTag(Message,"Size","0").c_str()), - RecivedHash.c_str(), Config); + Owner->Done(Message, ServerSize, RecivedHash.c_str(), Config); ItemDone(); // Log that we are done |