upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-07-15 04:52:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #9831 from mr-raj12/legacy-keys-dir-macos-master

Browse source 
legacy: use borg 1.x keys dir for v1 repos
This commit is contained in:
TW 2026-06-30 10:00:45 +02:00 committed by GitHub
commit 68455a34b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/borg/crypto/key.py
View file

@ -661,9 +661,18 @@ class FlexiKey:
return keyfile
return get_keys_dir()
def _keys_dir(self):
# v1 repos use the borg 1.x keys dir, which differs from the borg2 one on macOS
# (~/.config/borg/keys vs ~/Library/Application Support/borg/keys).
if self.repository.version == 1:
from ..legacy.fs import get_keys_dir as get_keys_dir_legacy
return get_keys_dir_legacy()
return get_keys_dir()
def _find_key_in_keys_dir(self):
id = self.repository.id
keys_path = Path(get_keys_dir())
keys_path = Path(self._keys_dir())
for entry in keys_path.iterdir():
filename = keys_path / entry.name
try:
@ -674,7 +683,7 @@ class FlexiKey:
def _find_all_keys_in_keys_dir(self):
# return all keyfiles in the keys dir that belong to this repository (multiple passphrases).
id = self.repository.id
keys_path = Path(get_keys_dir())
keys_path = Path(self._keys_dir())
found = []
if not keys_path.exists():
return found