summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-09-17 22:18:19 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-09-17 22:18:19 +0200
commitd667daf3e6ba5bfc7feb8a5ed0a0bd2d1febde4d (patch)
treedccdc5cb6ec9abb557f9df152b76693efdb58c41 /apt-pkg
parent0e510b0f46350480852b22b966601aaae8cef52f (diff)
parente438bafe7d578a04837c520ca5d69f38a6b993cf (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: debian/changelog
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire-item.cc23
1 files changed, 9 insertions, 14 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 058b8bf74..5df43726b 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1120,12 +1120,6 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash,
string FileName = LookupTag(Message,"Alt-Filename");
if (FileName.empty() == false)
{
- // The files timestamp matches
- if (StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false) == true)
- {
- ReverifyAfterIMS(FileName);
- return;
- }
Decompression = true;
Local = true;
DestFile += ".decomp";
@@ -1142,18 +1136,19 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash,
ErrorText = "Method gave a blank filename";
}
- // The files timestamp matches
- if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true)
- {
- ReverifyAfterIMS(FileName);
- return;
- }
-
if (FileName == DestFile)
Erase = true;
else
Local = true;
-
+
+ // The files timestamp matches, for non-local URLs reverify the local
+ // file, for local file, uncompress again to ensure the hashsum is still
+ // matching the Release file
+ if (!Local && StringToBool(LookupTag(Message,"IMS-Hit"),false) == true)
+ {
+ ReverifyAfterIMS(FileName);
+ return;
+ }
string decompProg;
// If we enable compressed indexes, queue for hash verification