From: David Kalnischkies Date: Sat, 13 Oct 2012 07:59:54 +0000 (+0200) Subject: correct "3 missing" to "2 missing" remap registrations as the Version X-Git-Tag: 0.9.7.6~2^2~6 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/dfe45e1f1133ffabe55297ae76c77a0767e3ae55 correct "3 missing" to "2 missing" remap registrations as the Version handled in NewVersion is already registered --- diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index d5f1f9072..4eaf40b51 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -774,7 +774,7 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, // Fill it in Ver = pkgCache::VerIterator(Cache,Cache.VerP + Version); - Dynamic DynV(Ver); + //Dynamic DynV(Ver); // caller MergeListVersion already takes care of it Ver->NextVer = Next; Ver->ID = Cache.HeaderP->VersionCount++; map_ptrloc const idxVerStr = WriteStringInMap(VerStr); diff --git a/debian/changelog b/debian/changelog index c06435102..307bd1eee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ apt (0.9.7.6) UNRELEASED; urgency=low [ David Kalnischkies ] * apt-pkg/pkgcachegen.cc: - ensure that dependencies for packages:none are always generated - - add 3 missing remap registrations causing a segfault in case + - add 2 missing remap registrations causing a segfault in case we use the not remapped iterators after a move of the mmap again * apt-pkg/pkgcache.cc: - ignore negative dependencies applying in the same group for