瀏覽代碼

correct "3 missing" to "2 missing" remap registrations as the Version
handled in NewVersion is already registered

David Kalnischkies 13 年之前
父節點
當前提交
dfe45e1f11
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      apt-pkg/pkgcachegen.cc
  2. 1 1
      debian/changelog

+ 1 - 1
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<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);

+ 1 - 1
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