* apt-pkg/acquire-worker.cc:

  - print filename in the unmatching size warning (Closes: #623137)

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index ddd8e31018c5bcc028d4fe0c2183fc558876704d..75e03232a1de76a28ed2e57de03159542d6a28d0 100644 (file)
--- 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 3f1c017c4ec29e21778501159e8a922c47933ee0..f14d7588c037e6388848afe6196cfba954994ecd 100644 (file)
--- 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