summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-10-15 18:32:14 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2014-10-15 18:32:14 +0200
commit0977f81757f42889a9edb761061529041afe0a06 (patch)
treeb8ccdbd39bce1a82de8afc587c9bbe5becfe2913 /apt-pkg
parent79e85ea6054c9f34572f06598f73782466b164a8 (diff)
parent5afcfe2a51a9e47e95023b99bcab065d1975e950 (diff)
Merge branch 'debian/sid' into debian/experimental
The acquire code changed completely, so this is more an import of the testcase and a new fix than the merge of an existent fix. Conflicts: apt-pkg/acquire-item.cc
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire-item.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index c63253447..5187738e9 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1288,6 +1288,11 @@ void pkgAcqIndex::ReverifyAfterIMS()
// a reverify (as its uncompressed on disk already)
DestFile = GetPartialFileNameFromURI(RealURI);
+ // do not reverify cdrom sources as apt-cdrom may rewrite the Packages
+ // file when its doing the indexcopy
+ if (RealURI.substr(0,6) == "cdrom:")
+ return;
+
// adjust DestFile if its compressed on disk
if (_config->FindB("Acquire::GzipIndexes",false) == true)
DestFile += '.' + CurrentCompressionExtension;
@@ -1398,11 +1403,6 @@ void pkgAcqIndex::StageDownloadDone(string Message,
// on if-modfied-since hit to avoid a stale attack against us
if(StringToBool(LookupTag(Message,"IMS-Hit"),false) == true)
{
- // do not reverify cdrom sources as apt-cdrom may rewrite the Packages
- // file when its doing the indexcopy
- if (RealURI.substr(0,6) == "cdrom:")
- return;
-
// The files timestamp matches, reverify by copy into partial/
EraseFileName = "";
ReverifyAfterIMS();