summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Behrmann <behrmann@physik.fu-berlin.de>2022-08-31 12:15:28 +0200
committerGitHub <noreply@github.com>2022-08-31 11:15:28 +0100
commitb9924df264884634092465b9d2edac3393768f2e (patch)
treeff777f1f2e7cceb07420934eb060f779e319ff90
parentGive the correct next event when the message timestamps are the same - MSC303... (diff)
downloadsynapse-b9924df264884634092465b9d2edac3393768f2e.tar.xz
Change dpkg-statoverride to use --force-statoverride-add (#13638)
The --force flag of dpkg-statoverride has been deprecated (apparently starting
with the dpkg version in Debian buster). It offers --force-all as q quick fix,
but the usage in the Debian postinst script is probably covered by
--force-statoverride-add.

Fixes: #8391

Signed-off-by: Jörg Behrmann <behrmann@physik.fu-berlin.de>
-rw-r--r--debian/changelog1
-rw-r--r--debian/matrix-synapse-py3.postinst2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 0709ae24e9..6a6f306019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ matrix-synapse-py3 (1.66.0~rc2+nmu1) UNRELEASED; urgency=medium
   * Update debhelper to compatibility level 12.
   * Drop the preinst script stopping synapse.
   * Allocate a group for the system user.
+  * Change dpkg-statoverride to --force-statoverride-add.
 
  -- Jörg Behrmann <behrmann@physik.fu-berlin.de>  Tue, 23 Aug 2022 17:17:00 +0100
 
diff --git a/debian/matrix-synapse-py3.postinst b/debian/matrix-synapse-py3.postinst
index 3c72b69bb7..acab0877ad 100644
--- a/debian/matrix-synapse-py3.postinst
+++ b/debian/matrix-synapse-py3.postinst
@@ -45,7 +45,7 @@ EOF
 
     for DIR in /var/lib/matrix-synapse /var/log/matrix-synapse /etc/matrix-synapse; do
       if ! dpkg-statoverride --list --quiet $DIR >/dev/null; then
-        dpkg-statoverride --force --quiet --update --add $USER "$(id -gn $USER)" 0755 $DIR
+        dpkg-statoverride --force-statoverride-add --quiet --update --add $USER "$(id -gn $USER)" 0755 $DIR
       fi
     done