dpkg: Move trigproc cycle reset inside try-deferred conditional

We should only reset the cycle detection in case we are not bailing out
from the processing with an error, otherwise we could come back to this
package and detect an artificial trigger cycle.

1 files changed, 10 insertions, 11 deletions

diff --git a/src/trigproc.c b/src/trigproc.c
index 5b7066d8a..3836c90fa 100644
--- a/src/trigproc.c
+++ b/src/trigproc.c
@@ -405,18 +405,17 @@ trigproc(struct pkginfo *pkg, enum trigproc_type type)
 			enqueue_package(pkg);
 			return;
 		} else if (ok == DEP_CHECK_HALT) {
-			/* We cannot process this package on this dpkg run,
-			 * and we can get here repeatedly if this package is
-			 * required to make progress for other packages. So
-			 * reset the trigger cycles tracking to avoid bogus
-			 * cycle detections. */
-			trigproc_reset_cycle();
-
-			/* When doing opportunistic trigger processing, nothing
-			 * requires us to be able to make progress; skip the
-			 * package and silently ignore the error due to
-			 * unsatisfiable dependencies. */
+			/* When doing opportunistic deferred trigger processing,
+			 * nothing requires us to be able to make progress;
+			 * skip the package and silently ignore the error due
+			 * to unsatisfiable dependencies. And because we can
+			 * end up here repeatedly, if this package is required
+			 * to make progress for other packages, we need to
+			 * reset the trigger cycle tracking to avoid detecting
+			 * bogus cycles*/
 			if (type == TRIGPROC_TRY_DEFERRED) {
+				trigproc_reset_cycle();
+
 				varbuf_destroy(&depwhynot);
 				return;
 			}