The following commit has been merged in the lenny branch:
commit 5a39b7b59a228dbffd805d39979e315aedac1ea8
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Mon Aug 11 20:25:34 2008 +0300
dpkg: Do not assert when configure or remove produced too many errors
Closes: #483655
diff --git a/ChangeLog b/ChangeLog
index 8d85dd5..068defe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-15 Ian Jackson <[EMAIL PROTECTED]>
+
+ * src/packages.c (process_queue): When onerr_abort is bigger than 0
+ return instead of breaking out of the loop, to avoid wrongly
+ asserting that !queue.length.
+
2008-08-15 Guillem Jover <[EMAIL PROTECTED]>
* lib/dbmodify.c (modstatdb_note): Do not call modstatdb_note_core if
diff --git a/debian/changelog b/debian/changelog
index 74f9b96..6dcdb12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ dpkg (1.14.21) UNRELEASED; urgency=low
triggers-awaited w/o the corresponding package with pending triggers.
Closes: #487637, #486843, #489068
* Fix --no-act in triggers related code. Closes: #495097
+ * Do not assert when dpkg stops processing packages due to too many
+ errors occurred while configuring or removing packages.
+ Thanks to Ian Jackson <[EMAIL PROTECTED]>. Closes: #483655
[ Updated scripts translations ]
* Russian (Yuri Kozlov). Closes: #490076
diff --git a/src/packages.c b/src/packages.c
index 8d22ae4..993301f 100644
--- a/src/packages.c
+++ b/src/packages.c
@@ -228,7 +228,8 @@ void process_queue(void) {
/* give up on it from the point of view of other packages, ie reset
istobe */
pkg->clientdata->istobe= itb_normal;
error_unwind(ehflag_bombout);
- if (onerr_abort > 0) break;
+ if (onerr_abort > 0)
+ return;
continue;
}
push_error_handler(&ejbuf,print_error_perpackage,pkg->name);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
