Add a few more comment around obscure bits of trigger handling code

diff --git a/ChangeLog b/ChangeLog
index 112b5bfe36c99d1daa821a088b0779413d70a5f8..fd9fd9a91b8be507f62bf65812dda80f898c91f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -138,6 +138,12 @@
        dpkg is unable to create a file so that it also refers to the real
        filename instead of the non-diverted name only.
 
+2008-05-29  Colin Watson  <cjwatson@debian.org>
+
+       * lib/dbmodify.c (modstatdb_note): Add a comment around obscure bits
+       of trigger handling code.
+       * src/trigproc.c (trigproc): Likewise.
+
 2008-05-29  Colin Watson  <cjwatson@debian.org>
 
        * lib/triglib.c (trig_incorporate): Fix typo in comment.

diff --git a/lib/dbmodify.c b/lib/dbmodify.c
index 1eacd5a672e9d7ebe6faebe6a6034e37ae9a2c1b..cdaa1624603822577a30bcc85f83c62412260ce3 100644 (file)
--- a/lib/dbmodify.c
+++ b/lib/dbmodify.c
@@ -251,6 +251,9 @@ void modstatdb_note(struct pkginfo *pkg) {
 
   onerr_abort++;
 
+  /* Clear pending triggers here so that only code that sets the status
+   * to interesting (for triggers) values has to care about triggers.
+   */
   if (pkg->status != stat_triggerspending &&
       pkg->status != stat_triggersawaited)
     pkg->trigpend_head = NULL;

diff --git a/src/trigproc.c b/src/trigproc.c
index b327f5d3d9edb29ceb090f815b8d6fa8791100ea..32a6ed523bf76c7c8f1c300db7675b66bdd91bff 100644 (file)
--- a/src/trigproc.c
+++ b/src/trigproc.c
@@ -295,6 +295,9 @@ trigproc(struct pkginfo *pkg)
                }
                varbufaddc(&namesarg, 0);
 
+               /* Setting the status to halfconfigured
+                * causes modstatdb_note to clear pending triggers.
+                */
                pkg->status = stat_halfconfigured;
                modstatdb_note(pkg);