From bde0f11e1ec82f3343e8eba90e5afc02432c000c Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 4 Feb 2023 00:14:40 +0100 Subject: [PATCH] get_security_dir: legacy=False default --- src/borg/helpers/fs.py | 2 +- src/borg/testsuite/helpers.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/borg/helpers/fs.py b/src/borg/helpers/fs.py index 495210d0c..805746557 100644 --- a/src/borg/helpers/fs.py +++ b/src/borg/helpers/fs.py @@ -81,7 +81,7 @@ def get_keys_dir(*, legacy=False): return keys_dir -def get_security_dir(repository_id=None, *, legacy=True): +def get_security_dir(repository_id=None, *, legacy=False): """Determine where to store local security information.""" security_dir = os.environ.get("BORG_SECURITY_DIR") if security_dir is None: diff --git a/src/borg/testsuite/helpers.py b/src/borg/testsuite/helpers.py index 4dce31c99..7a237484e 100644 --- a/src/borg/testsuite/helpers.py +++ b/src/borg/testsuite/helpers.py @@ -693,12 +693,20 @@ def test_get_security_dir(monkeypatch): monkeypatch.delenv("BORG_BASE_DIR", raising=False) if is_win32: monkeypatch.delenv("BORG_SECURITY_DIR", raising=False) - assert get_security_dir(legacy=False) == os.path.join( + assert get_security_dir() == os.path.join( os.path.expanduser("~"), "AppData", "Local", "borg", "borg", "security" ) - assert get_security_dir(repository_id="1234", legacy=False) == os.path.join( + assert get_security_dir(repository_id="1234") == os.path.join( os.path.expanduser("~"), "AppData", "Local", "borg", "borg", "security", "1234" ) + elif is_darwin: + monkeypatch.delenv("BORG_SECURITY_DIR", raising=False) + assert get_security_dir() == os.path.join(os.path.expanduser("~"), "Library", "Preferences", "borg", "security") + assert get_security_dir(repository_id="1234") == os.path.join( + os.path.expanduser("~"), "Library", "Preferences", "borg", "security", "1234" + ) + monkeypatch.setenv("BORG_SECURITY_DIR", "/var/tmp") + assert get_security_dir() == "/var/tmp" else: monkeypatch.delenv("XDG_CONFIG_HOME", raising=False) monkeypatch.delenv("BORG_SECURITY_DIR", raising=False)