diff options
| author | Colin Watson <cjwatson@canonical.com> | 2012-10-16 11:35:49 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@canonical.com> | 2012-10-16 11:35:49 +0100 |
| commit | bed5b76cfc18fbe0683acb17b4162a49390848f3 (patch) | |
| tree | 80c2a364b7c7edaefa287748eac3dd36ac0a70a2 | |
| parent | 4f18d36ed64f42cc99f40701f66532dc59d4af09 (diff) | |
Revert "missing remap registration" change from 0.9.7.5ubuntu4; this
iterator was already registered, and double registration causes a crash
(LP: #1067056).
| -rw-r--r-- | apt-pkg/pkgcachegen.cc | 1 | ||||
| -rw-r--r-- | debian/changelog | 8 |
2 files changed, 8 insertions, 1 deletions
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<pkgCache::VerIterator> 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 <cjwatson@ubuntu.com> Tue, 16 Oct 2012 11:34:36 +0100 + apt (0.9.7.5ubuntu4) quantal-proposed; urgency=low [ Colin Watson ] |