From 594b9a5a0e80f154935ed638a37a201d74455934 Mon Sep 17 00:00:00 2001 From: Bludator Date: Fri, 17 Feb 2023 00:16:55 +0100 Subject: [PATCH 1/2] keep permissions of updated config --- mautrix/util/config/file.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mautrix/util/config/file.py b/mautrix/util/config/file.py index 5911af3c..16263ed6 100644 --- a/mautrix/util/config/file.py +++ b/mautrix/util/config/file.py @@ -9,6 +9,7 @@ import logging import os import pkgutil +from stat import S_IMODE import tempfile from ruamel.yaml import YAML @@ -55,6 +56,16 @@ def save(self) -> None: except OSError as e: log.warning(f"Failed to create tempfile to write updated config to disk: {e}") return + try: + mode = S_IMODE(os.stat(self.path).st_mode) + os.chmod(tf.name, mode) + except FileNotFoundError: + pass + except OSError as e: + log.warning(f"Failed to copy permissions to tempfile: {e}") + tf.file.close() + os.remove(tf.name) + return try: yaml.dump(self._data, tf) except OSError as e: From 60d46ef9759d1e843007892cfcfc930907e028ee Mon Sep 17 00:00:00 2001 From: Bludator Date: Sun, 1 Oct 2023 21:27:40 +0200 Subject: [PATCH 2/2] fix formating --- mautrix/util/config/file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mautrix/util/config/file.py b/mautrix/util/config/file.py index 16263ed6..3d7c5fbf 100644 --- a/mautrix/util/config/file.py +++ b/mautrix/util/config/file.py @@ -6,10 +6,10 @@ from __future__ import annotations from abc import ABC +from stat import S_IMODE import logging import os import pkgutil -from stat import S_IMODE import tempfile from ruamel.yaml import YAML