summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2015-01-30 18:01:20 +0100
committerSimon McVittie <smcv@debian.org>2015-01-30 18:01:25 +0100
commitbcc9fe912cdaa6bd0cb18297441a46251668f3f5 (patch)
tree4f69f3ca66a2844e5eaec07b1e120f6da34faa09
parenteee205afb6572eab74c5f07afe13fa0c21c5da92 (diff)
downloaddbus-bcc9fe912cdaa6bd0cb18297441a46251668f3f5.tar.gz
Relax the triggers from interest to interest-noawait (Closes: #771989; mitigates: #776063)
This is not strictly correct, because the purpose of the triggers is to set up the .conf, .service files for system services before those services satisfy dependencies. However, it mitigates #776063 (apt getting into a stuck state during upgrades), and should in principle be redundant anyway, because dbus-daemon is meant to use inotify to keep up with configuration changes. See #771989, #776063 for details.
-rw-r--r--debian/changelog15
-rw-r--r--debian/dbus.triggers4
2 files changed, 17 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 79983242..06c1b8de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+dbus (1.8.14-2) UNRELEASED; urgency=medium
+
+ * Relax the triggers from interest to interest-noawait (Closes: #771989;
+ mitigates: #776063).
+
+ This is not strictly correct, because the purpose of the triggers
+ is to set up the .conf, .service files for system services before those
+ services satisfy dependencies. However, it mitigates #776063
+ (apt getting into a stuck state during upgrades), and should in
+ principle be redundant anyway, because dbus-daemon is meant to use
+ inotify to keep up with configuration changes. See #771989, #776063
+ for details.
+
+ -- Simon McVittie <smcv@debian.org> Fri, 30 Jan 2015 17:55:22 +0100
+
dbus (1.8.14-1) unstable; urgency=medium
* New upstream release to harden dbus-daemon against packages that install
diff --git a/debian/dbus.triggers b/debian/dbus.triggers
index cf05f16b..d94c5cf4 100644
--- a/debian/dbus.triggers
+++ b/debian/dbus.triggers
@@ -1,2 +1,2 @@
-interest /etc/dbus-1/system.d
-interest /usr/share/dbus-1/system-services
+interest-noawait /etc/dbus-1/system.d
+interest-noawait /usr/share/dbus-1/system-services