From bed5b76cfc18fbe0683acb17b4162a49390848f3 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 16 Oct 2012 11:35:49 +0100 Subject: Revert "missing remap registration" change from 0.9.7.5ubuntu4; this iterator was already registered, and double registration causes a crash (LP: #1067056). --- apt-pkg/pkgcachegen.cc | 1 - debian/changelog | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 03f8aea5a..67018f057 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -722,7 +722,6 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, // Fill it in Ver = pkgCache::VerIterator(Cache,Cache.VerP + Version); - Dynamic DynV(Ver); Ver->NextVer = Next; Ver->ID = Cache.HeaderP->VersionCount++; map_ptrloc const idxVerStr = WriteStringInMap(VerStr); diff --git a/debian/changelog b/debian/changelog index d8ff9965d..fb16dc85d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.9.7.5ubuntu5) UNRELEASED; urgency=low + + * Revert "missing remap registration" change from 0.9.7.5ubuntu4; this + iterator was already registered, and double registration causes a crash + (LP: #1067056). + + -- Colin Watson Tue, 16 Oct 2012 11:34:36 +0100 + apt (0.9.7.5ubuntu4) quantal-proposed; urgency=low [ Colin Watson ] -- cgit v1.2.3