The following commit has been merged in the lenny branch:
commit 4c93e0ea1c95dd9259ae0424766913ade140a4b3
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Mon Aug 11 20:06:25 2008 +0300
Revert "Handle correctly packages in triggers-awaited state during recovery"
This reverts commit 4c57b1459ee88b06947d6e1afc2a93a67d2c2ed9.
diff --git a/ChangeLog b/ChangeLog
index 9805bbf..20ff0e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,3 @@
-2008-07-04 Ian Jackson <[EMAIL PROTECTED]>
-
- * src/packages.c (process_queue): packages which are in
- triggers-awaited state without any corresponding triggers-pending
- can be configured and can thus satisfy dependencies of other
- packages.
-
2008-06-24 Raphael Hertzog <[EMAIL PROTECTED]>
* debian/archtable: Add armel.
diff --git a/debian/changelog b/debian/changelog
index f9234c8..98e9f02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,9 +13,6 @@ dpkg (1.14.21) UNRELEASED; urgency=low
* Modified Dpkg::BuildOptions to recognize and use spaces as separator
in DEB_BUILD_OPTIONS (in order to conform with the Debian policy
ruling established in #430649).
- * Apply patch from Ian Jackson to correctly handle packages in status
- triggers-awaited while trying to sort out a proper order for configuring
- packages. Closes: #143307
[ Updated scripts translations ]
* Russian (Yuri Kozlov). Closes: #490076
diff --git a/src/packages.c b/src/packages.c
index 25395c4..8d22ae4 100644
--- a/src/packages.c
+++ b/src/packages.c
@@ -211,12 +211,7 @@ void process_queue(void) {
action_todo = cipaction->arg;
if (sincenothing++ > queue.length * 2 + 2) {
- if (progress_bytrigproc &&
- (progress_bytrigproc->trigpend_head ||
- (progress_bytrigproc->status >= stat_triggersawaited &&
- progress_bytrigproc->othertrigaw_head))) {
- debug(dbg_depcon, "using progress_bytrigproc %s instead of %s",
- progress_bytrigproc->name, pkg->name);
+ if (progress_bytrigproc && progress_bytrigproc->trigpend_head) {
add_to_queue(pkg);
pkg = progress_bytrigproc;
action_todo = act_configure;
@@ -251,8 +246,7 @@ void process_queue(void) {
/* Fall through. */
case act_configure:
/* Do whatever is most needed. */
- if (pkg->trigpend_head ||
- (pkg->status >= stat_triggersawaited && pkg->othertrigaw_head))
+ if (pkg->trigpend_head)
trigproc(pkg);
else
deferred_configure(pkg);
@@ -395,7 +389,7 @@ static int deppossi_ok_found(struct pkginfo *possdependee,
* anyway, and that trigger processing will be a noop except for
* sorting out all of the packages which name it in T-Awaited.
*
- * (This situation can only arise if modstatdb_note succeeds in
+ * (This situation can only arise if modstatdb_note success in
* clearing the triggers-pending status of the pending package
* but then fails to go on to update the awaiters.)
*/
@@ -615,13 +609,8 @@ int dependencies_ok(struct pkginfo *pkg, struct pkginfo
*removing,
}
if (ok == 0 && (pkg->clientdata && pkg->clientdata->istobe == itb_remove))
ok= 1;
-
- if (!anycannotfixbytrig && canfixbytrig) {
- debug(dbg_depcon, "progress_bytrigproc %s (was %s)",
- canfixbytrig->name,
- progress_bytrigproc ? progress_bytrigproc->name : "<none>");
+ if (!anycannotfixbytrig && canfixbytrig)
progress_bytrigproc = canfixbytrig;
- }
varbuffree(&oemsgs);
debug(dbg_depcon,"ok %d msgs >>%.*s<<", ok, (int)aemsgs->used, aemsgs->buf);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
