diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2011-06-17 23:53:32 +0200 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2011-06-18 00:56:38 +0200 |
| commit | 3c3dce24847d0040547aa2a2bd9da5dcca2df0c7 (patch) | |
| tree | 6fe925850c9f1e80c9fd2535992dc8202ba91c33 | |
| parent | a36cadba41b19d5908bdfcb658cf01af07c1436a (diff) | |
| download | dpkg-3c3dce24847d0040547aa2a2bd9da5dcca2df0c7.tar.gz | |
dpkg: ensure that post_postinst_tasks() doesn't introduce bad data
The pending triggers were removed because the postinst has just been
run, unfortunately in some cases it would restore the status to
pending-triggers. This is notably the case when a package is
removed while being in triggers-pending and when the prerm fails.
In fact it was not correct to remove the pending triggers in this
function because only "postinst configure" should clear the pending
triggers. Thus move the removal of the pending triggers to
deferred_configure() in src/configure.c and reset the status
to its "normal" value when the target status is one of triggers-awaited,
triggers-pending or installed.
With this change, it's no longer possible to have a status of
triggers-pending without any pending trigger in trigpend_head.
Note that despite this change, the pending triggers are lost
during a failed removal because dpkg switches the package to
halfconfigured before running "prerm remove" and modstatdb_note()
drops the pending triggers in that situation.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | src/configure.c | 1 | ||||
| -rw-r--r-- | src/help.c | 7 |
3 files changed, 8 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 8b100a6dc..b524ea711 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,8 +38,8 @@ dpkg (1.16.1) UNRELEASED; urgency=low debian/source/patch-header. Closes: #629582 * Changed dpkg-source --after-build to automatically unapply patches that it has applied during --before-build. - * Fix one possible cause for the assertion failure "pigp->trigpend_head". - LP: #798793 + * Fix two possible causes for the assertion failure "pigp->trigpend_head". + LP: #798793, #424358 Closes: #560251 [ Guillem Jover ] * Install deb-src-control(5) man pages in dpkg-dev. Closes: #620520 diff --git a/src/configure.c b/src/configure.c index 3ab9905e4..97689c1d9 100644 --- a/src/configure.c +++ b/src/configure.c @@ -355,6 +355,7 @@ deferred_configure(struct pkginfo *pkg) NULL); pkg->eflag = eflag_ok; + pkg->trigpend_head = NULL; post_postinst_tasks(pkg, stat_installed); } diff --git a/src/help.c b/src/help.c index 88fa3969f..fa33b1a5c 100644 --- a/src/help.c +++ b/src/help.c @@ -214,8 +214,11 @@ preexecscript(struct command *cmd) void post_postinst_tasks(struct pkginfo *pkg, enum pkgstatus new_status) { - pkg->trigpend_head = NULL; - pkg->status = pkg->trigaw.head ? stat_triggersawaited : new_status; + if (new_status < stat_triggersawaited) + pkg->status = new_status; + else + pkg->status = pkg->trigaw.head ? stat_triggersawaited : + pkg->trigpend_head ? stat_triggerspending : stat_installed; post_postinst_tasks_core(pkg); } |