diff options
author | Simon McVittie <smcv@debian.org> | 2014-12-23 21:24:31 +0000 |
---|---|---|
committer | Simon McVittie <smcv@debian.org> | 2014-12-23 21:24:31 +0000 |
commit | 88afb46fc5901821bd3fd77459c4cb9577fab25a (patch) | |
tree | 75b54ffdb6e83de0b855d5bfd9330e3d2e222b2f /debian/dbus.postinst | |
parent | c3963adc0a056e78367b13849cd63dbcd19de72e (diff) | |
download | dbus-88afb46fc5901821bd3fd77459c4cb9577fab25a.tar.gz |
preinst: partially revert change from 1.8.12-2debian/1.8.12-3
* preinst: partially revert change from 1.8.12-2. It seems that the
preinst is too late to add a useful dpkg-statoverride entry: dpkg has
already loaded the statoverride database by this point, and if we add
the entry in the preinst, dpkg-statoverride won't run and have
its --update side-effect in the postinst. (Closes: #773107, #773838)
* postinst: don't run dpkg-statoverride with 2>/dev/null: in the unlikely
event that it fails for a reason other than "not overridden" (which
results in silently exiting 1), we'll want to know about it.
Diffstat (limited to 'debian/dbus.postinst')
-rw-r--r-- | debian/dbus.postinst | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/debian/dbus.postinst b/debian/dbus.postinst index 27f77c22..c76a02c6 100644 --- a/debian/dbus.postinst +++ b/debian/dbus.postinst @@ -31,9 +31,7 @@ if [ "$1" = configure ]; then --disabled-password \ --group "$MESSAGEUSER" - # The preinst might have done this already, or a sysadmin might have - # set up their own dpkg-statoverride. Keep this in sync with the preinst. - if ! dpkg-statoverride --list "$LAUNCHER" >/dev/null 2>&1; then + if ! dpkg-statoverride --list "$LAUNCHER" >/dev/null; then dpkg-statoverride --update --add root "$MESSAGEUSER" 4754 "$LAUNCHER" fi |