Bug#777646: pre-approval: unblock: dpkg/1.17.24
Hi!
On Wed, 2015-02-11 at 11:40:39 +0100, Andreas Beckmann wrote:
> + * Switch versioned Breaks for trigger cycles from << to <= relations (with
> + the necessary version adjustments).
>
> Your changelog and commit message describe the change in the wrong direction,
> the patch shows it the other way:
Nice catch! Fixed locally.
I'm attaching the two other patches targetted for 1.17.x. The revert
passes the functional test suite (although I've disabled three tests
that require dependency checks on trigger processing).
Thanks,
Guillem
From 567be0ef2128dc6add2261d376559ec0ea8de0e5 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 20 Feb 2015 17:20:04 +0100
Subject: [PATCH] dpkg: Disable dependency checks on trigger processing
There are still trigger showing up this close to the Debian release,
which are hard to detect automatically as they are caused by maintainer
script actions.
The checks are only removed in the 1.17.x series, and will be kept in
force for the 1.18.x series.
Requested-by: Niels Thykier <niels@thykier.net> (Debian Release Manager)
---
debian/changelog | 4 ++++
src/trigproc.c | 12 ++++++++++++
2 files changed, 16 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 53f512f..da2bfcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ dpkg (1.17.24) UNRELEASED; urgency=low
* Check that HAVE_DECL_SYS_SIGLIST is 0 instead of undefined, to fix a
build failure on uclibc based systems. Closes: #777044
Based on a patch by Alex Potapenko <opotapenko@gmail.com>.
+ * Disable dependency checks on trigger processing. There are still trigger
+ cycles showing up this close to the Debian release, which are hard to
+ detect automatically as they are caused by maintainer script actions.
+ Requested by Niels Thykier <niels@thykier.net> (Debian Release Manager).
-- Guillem Jover <guillem@debian.org> Mon, 02 Feb 2015 19:46:07 +0100
diff --git a/src/trigproc.c b/src/trigproc.c
index bb17346..77b4877 100644
--- a/src/trigproc.c
+++ b/src/trigproc.c
@@ -365,11 +365,18 @@ trigproc(struct pkginfo *pkg, enum trigproc_type type)
pkg->clientdata->trigprocdeferred = NULL;
if (pkg->trigpend_head) {
+/*
+ * Disable dependency checks on trigger processing only for the 1.17.x cycle
+ * as it is causing too much problems too close to the Debian jessie release.
+ */
+#if 0
enum dep_check ok;
+#endif
assert(pkg->status == PKG_STAT_TRIGGERSPENDING ||
pkg->status == PKG_STAT_TRIGGERSAWAITED);
+#if 0
if (dependtry > 1) {
gaveup = check_trigger_cycle(pkg);
if (gaveup == pkg)
@@ -421,6 +428,11 @@ trigproc(struct pkginfo *pkg, enum trigproc_type type)
if (gaveup == pkg)
return;
}
+#else
+ gaveup = check_trigger_cycle(pkg);
+ if (gaveup == pkg)
+ return;
+#endif
printf(_("Processing triggers for %s (%s) ...\n"),
pkg_name(pkg, pnaw_nonambig),
--
2.2.1.209.g41e5f3a
From ee90d408f0f549aa1e686270fddaf2edaa4ed45f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Wed, 11 Feb 2015 08:33:21 +0100
Subject: [PATCH] debian: drop myself from Uploaders
Cherry picked from commit 10ff6c4fc598dbc9697c825a8c8e1bf25caa2fcb.
Signed-off-by: Guillem Jover <guillem@debian.org>
---
debian/changelog | 3 +++
debian/control | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index da2bfcc..9ef67a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ dpkg (1.17.24) UNRELEASED; urgency=low
detect automatically as they are caused by maintainer script actions.
Requested by Niels Thykier <niels@thykier.net> (Debian Release Manager).
+ [ Raphaël Hertzog ]
+ * Drop myself from Uploaders.
+
-- Guillem Jover <guillem@debian.org> Mon, 02 Feb 2015 19:46:07 +0100
dpkg (1.17.23) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 18fe580..12fb93f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: dpkg
Section: admin
Priority: required
Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
-Uploaders: Guillem Jover <guillem@debian.org>, Raphaël Hertzog <hertzog@debian.org>
+Uploaders: Guillem Jover <guillem@debian.org>
Origin: debian
Bugs: debbugs://bugs.debian.org
Homepage: https://wiki.debian.org/Teams/Dpkg
--
2.2.1.209.g41e5f3a
Reply to: