summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2012-10-13 09:59:54 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-10-13 09:59:54 +0200
commitdfe45e1f1133ffabe55297ae76c77a0767e3ae55 (patch)
tree4bdbb5ceddf5ede4347bba91c45a814afc0d4bb2
parent95f9393859c464e89467fba096074922708010d1 (diff)
correct "3 missing" to "2 missing" remap registrations as the Version
handled in NewVersion is already registered
-rw-r--r--apt-pkg/pkgcachegen.cc2
-rw-r--r--debian/changelog2
2 files changed, 2 insertions, 2 deletions
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<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);
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