diff options
| author | Peter Karlsson <peterk@debian.org> | 2007-10-08 11:44:54 +0100 |
|---|---|---|
| committer | Peter Karlsson <peterk@debian.org> | 2007-10-08 11:44:54 +0100 |
| commit | 21231056c2f4fb82730c0ac7e7f90456668cae38 (patch) | |
| tree | 1f9ca6a27065dce5014adea7095596ec6a8cb744 /apt-pkg/acquire-worker.cc | |
| parent | 28b68bf4207be80d4549579f34262f1248a2e528 (diff) | |
| parent | 24401c09f0a826ec0074f46dfe70efe3aaf79f25 (diff) | |
Merge upstream.
Diffstat (limited to 'apt-pkg/acquire-worker.cc')
| -rw-r--r-- | apt-pkg/acquire-worker.cc | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 25d40ef54..739c9e32c 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -267,8 +267,25 @@ bool pkgAcquire::Worker::RunMessages() _error->Warning("Bizarre Error - File size is not what the server reported %s %lu", LookupTag(Message,"Size","0").c_str(),TotalSize); + // see if there is a hash to verify + string RecivedHash; + HashString expectedHash(Owner->HashSum()); + if(!expectedHash.empty()) + { + string hashTag = expectedHash.HashType()+"-Hash"; + string hashSum = LookupTag(Message, hashTag.c_str()); + if(!hashSum.empty()) + RecivedHash = expectedHash.HashType() + ":" + hashSum; + if(_config->FindB("Debug::pkgAcquire::Auth", false) == true) + { + clog << "201 URI Done: " << Owner->DescURI() << endl + << "RecivedHash: " << RecivedHash << endl + << "ExpectedHash: " << expectedHash.toStr() + << endl << endl; + } + } Owner->Done(Message,atoi(LookupTag(Message,"Size","0").c_str()), - LookupTag(Message,"MD5-Hash"),Config); + RecivedHash.c_str(), Config); ItemDone(); // Log that we are done |