From d302a22d3e4471ba836c61dc1c0fce2128ea5e2e Mon Sep 17 00:00:00 2001 From: cronekorkn Date: Mon, 9 Oct 2023 08:58:31 +0200 Subject: [PATCH] python 3.12 compat --- bundles/build-ci/metadata.py | 2 +- bundles/nextcloud/metadata.py | 10 +++++----- requirements.txt | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bundles/build-ci/metadata.py b/bundles/build-ci/metadata.py index 83c7b95..967397c 100644 --- a/bundles/build-ci/metadata.py +++ b/bundles/build-ci/metadata.py @@ -18,7 +18,7 @@ def ssh_keys(metadata): }, 'sudoers': { 'build-ci': { - f"/usr/bin/chown -R build-ci\:{quote(ci['group'])} {quote(ci['path'])}" + f"/usr/bin/chown -R build-ci\\:{quote(ci['group'])} {quote(ci['path'])}" for ci in metadata.get('build-ci').values() } }, diff --git a/bundles/nextcloud/metadata.py b/bundles/nextcloud/metadata.py index 5c14e2b..004b3c7 100644 --- a/bundles/nextcloud/metadata.py +++ b/bundles/nextcloud/metadata.py @@ -29,8 +29,8 @@ defaults = { 'exclude': [ '^appdata_', '^updater-', - '^nextcloud\.log', - '^updater\.log', + '^nextcloud\\.log', + '^updater\\.log', '^[^/]+/cache', '^[^/]+/files_versions', '^[^/]+/files_trashbin', @@ -123,9 +123,9 @@ def config(metadata): ], 'cache_path': '/var/lib/nextcloud/.cache', 'upgrade.disable-web': True, - 'memcache.local': '\OC\Memcache\Redis', - 'memcache.locking': '\OC\Memcache\Redis', - 'memcache.distributed': '\OC\Memcache\Redis', + 'memcache.local': '\\OC\\Memcache\\Redis', + 'memcache.locking': '\\OC\\Memcache\\Redis', + 'memcache.distributed': '\\OC\\Memcache\\Redis', 'redis': { 'host': '/var/run/redis/nextcloud.sock' }, diff --git a/requirements.txt b/requirements.txt index 0ff4492..0f80ca6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,3 +4,4 @@ PyNaCl PyYAML pyqrcode cache_to_disk +setuptools