summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-08-08 16:18:52 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-08-08 16:18:52 +0200
commit629b60f6feea2d2d356645aa2615b212481bd3d8 (patch)
tree2924805510704eff81ea8c9cd6cd4ba71be16e4c
parent02734b011499cebc763b6700072a4df2abb5afb4 (diff)
parentb1660aa192ff24747ac247805eda47b84a9cf933 (diff)
fix crash when P.Arch() was used but the cache got remapped
-rw-r--r--apt-pkg/acquire-item.cc2
-rw-r--r--debian/changelog3
2 files changed, 3 insertions, 2 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 9313c4b47..d4b451d5b 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1258,7 +1258,7 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash, /*{{{*
if (SigFile == "")
{
// There was no signature file, so we are finished. Download
- // the indexes and do hashsum verification
+ // the indexes and do only hashsum verification
MetaIndexParser->Load(DestFile);
QueueIndexes(true);
}
diff --git a/debian/changelog b/debian/changelog
index f162e20f4..489960912 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.8.15.6) unstable; urgency=low
+apt (0.8.15.5.6) UNRELEASED; urgency=low
* apt-pkg/contrib/fileutl.{cc,h}:
- add GetModificationTime() helper
@@ -11,6 +11,7 @@ apt (0.8.15.6) unstable; urgency=low
- use ref-to-ptr semantic in NewDepends() to ensure that the
libapt does not segfault if the cache is remapped in between
(LP: #812862)
+ - fix crash when P.Arch() was used but the cache got remapped
* test/integration/test-hashsum-verification:
- add regression test for hashsum verification
* apt-pkg/acquire-item.cc: