The following commit has been merged in the master branch:
commit 5f1ba89ae91a4f04ae28069c8d5e166aa355a93d
Author: Guillem Jover <[email protected]>
Date: Sun Apr 7 02:24:46 2013 +0200
dpkg: Move modstatdb_note() calls from post_postinst_tasks_core() to call
sites
This moves the calls near where the package status is being changed,
and makes it obvious that we are creating an update log entry.
diff --git a/src/script.c b/src/script.c
index 94c4f0a..d8ba6a3 100644
--- a/src/script.c
+++ b/src/script.c
@@ -3,7 +3,7 @@
* script.c - maintainer script routines
*
* Copyright © 1995 Ian Jackson <[email protected]>
- * Copyright © 2007-2012 Guillem Jover <[email protected]>
+ * Copyright © 2007-2013 Guillem Jover <[email protected]>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -60,6 +60,7 @@ post_postinst_tasks(struct pkginfo *pkg, enum pkgstatus
new_status)
pkg_set_status(pkg, stat_triggerspending);
else
pkg_set_status(pkg, stat_installed);
+ modstatdb_note(pkg);
post_postinst_tasks_core(pkg);
}
@@ -67,8 +68,6 @@ post_postinst_tasks(struct pkginfo *pkg, enum pkgstatus
new_status)
void
post_postinst_tasks_core(struct pkginfo *pkg)
{
- modstatdb_note(pkg);
-
if (!f_noact) {
debug(dbg_triggersdetail,
"post_postinst_tasks_core - trig_incorporate");
diff --git a/src/trigproc.c b/src/trigproc.c
index 6372c90..98c7fcf 100644
--- a/src/trigproc.c
+++ b/src/trigproc.c
@@ -4,7 +4,7 @@
*
* Copyright © 2007 Canonical Ltd
* written by Ian Jackson <[email protected]>
- * Copyright © 2008-2012 Guillem Jover <[email protected]>
+ * Copyright © 2008-2013 Guillem Jover <[email protected]>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -353,6 +353,7 @@ trigproc(struct pkginfo *pkg)
pkg_set_status(pkg, stat_triggerspending);
else
pkg_set_status(pkg, stat_installed);
+ modstatdb_note(pkg);
post_postinst_tasks_core(pkg);
} else {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
