This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
commit 3404fd24ef8020b4d6dc17adb82d7e6c035d90dc Author: Guillem Jover <[email protected]> Date: Wed Aug 17 02:54:50 2016 +0200 libdpkg: Reset pkg db when shutting down the modstat db --- debian/changelog | 2 ++ dselect/main.cc | 2 +- lib/dpkg/dbmodify.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index da763d2..29479f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ dpkg (1.18.11) UNRELEASED; urgency=medium Closes: #787980 * Switch from non-freeing malloc to m_malloc on statdb slurping. * Switch from non-freeing malloc to m_malloc for invoke hooks. + * Always reset the package in-core database when shutting down the package + database journal. * Perl modules: - Obsolete Source-Version substvar in Dpkg::Substvars by emitting errors. - Rework keyring hooks in Dpkg::Vendor. Deprecate the keyrings hook, and diff --git a/dselect/main.cc b/dselect/main.cc index 9146b22..9808774 100644 --- a/dselect/main.cc +++ b/dselect/main.cc @@ -387,7 +387,7 @@ urqresult urq_list(void) { delete l; modstatdb_shutdown(); - pkg_db_reset(); + return urqr_normal; } diff --git a/lib/dpkg/dbmodify.c b/lib/dpkg/dbmodify.c index ebf8bb8..ec11021 100644 --- a/lib/dpkg/dbmodify.c +++ b/lib/dpkg/dbmodify.c @@ -341,6 +341,8 @@ void modstatdb_shutdown(void) { break; } + pkg_db_reset(); + modstatdb_done(); } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/dpkg/dpkg.git
