소스 검색

dpkg: Reset trigger cycle tracking on unsatisfied dependencies during trigproc

If we are not going to process triggers due to an unsatisfied
dependency, we should reset the trigger cycle tracking information
so that we do not end up reporting bogus cycle errors.

Closes: #771730
Guillem Jover 11 년 전
부모
커밋
f58eee9edb
2개의 변경된 파일9개의 추가작업 그리고 0개의 파일을 삭제
  1. 2 0
      debian/changelog
  2. 7 0
      src/trigproc.c

+ 2 - 0
debian/changelog

@@ -3,6 +3,8 @@ dpkg (1.17.23) UNRELEASED; urgency=low
   [ Guillem Jover ]
   * Use a matching group instead of ${^MATCH} in s/// in dselect build script.
   * Skip tar extractor tests if tar is not GNU tar >= 1.27.
+  * Reset the trigger cycle tracking on unsatisfied dependencies during
+    trigger processing. Closes: #771730
 
   [ Updated programs translations ]
   * Basque (Iñaki Larrañaga Murgoitio). Closes: #771893

+ 7 - 0
src/trigproc.c

@@ -385,6 +385,13 @@ 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 processig, nothing
 			 * requires us to be able to make progress; skip the
 			 * package and silently ignore the error due to