diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-04-26 22:37:46 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-04-26 22:37:46 +0200 |
| commit | 378fcbd65e8c93d49a729bcc37fac889d8228357 (patch) | |
| tree | 7e2d203eabd2147505d861873f6e3316b4325dfd | |
| parent | 7f24da09a135c4ec079e9ede7b3dc294b1baac37 (diff) | |
* apt-pkg/acquire-worker.cc:
- print filename in the unmatching size warning (Closes: #623137)
| -rw-r--r-- | apt-pkg/acquire-worker.cc | 11 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 8 insertions, 7 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 diff --git a/debian/changelog b/debian/changelog index 3f1c017c4..f14d7588c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,8 +40,10 @@ apt (0.8.14.2) UNRELEASED; urgency=low * test/versions.lst: - disable obscure version number tests with versions dpkg doesn't allow any more as they don't start with a number + * apt-pkg/acquire-worker.cc: + - print filename in the unmatching size warning (Closes: #623137) - -- David Kalnischkies <kalnischkies@gmail.com> Tue, 26 Apr 2011 19:30:12 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Tue, 26 Apr 2011 22:36:53 +0200 apt (0.8.14.1) unstable; urgency=low |