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 d5f1f90722d1c99cfc7081e79dace073b4d4c417..4eaf40b51553424b68c0733171c0bcbd5b1e138b 100644 (file)
--- 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);
    
    // Fill it in
    Ver = pkgCache::VerIterator(Cache,Cache.VerP + Version);

-   Dynamic<pkgCache::VerIterator> DynV(Ver);
+   //Dynamic<pkgCache::VerIterator> DynV(Ver); // caller MergeListVersion already takes care of it

    Ver->NextVer = Next;
    Ver->ID = Cache.HeaderP->VersionCount++;
    map_ptrloc const idxVerStr = WriteStringInMap(VerStr);
    Ver->NextVer = Next;
    Ver->ID = Cache.HeaderP->VersionCount++;
    map_ptrloc const idxVerStr = WriteStringInMap(VerStr);

diff --git a/debian/changelog b/debian/changelog
index c0643510282e8700dbc4ec75c70ad293381f9a48..307bd1eee25ebd280fb5605c1f490116694ec20d 100644 (file)
--- 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
   [ 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
       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