mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-22 14:11:27 +00:00
Code Issues Releases Wiki Activity

fix crash with relative BORG_KEY_FILE, fixes #3197

Browse source
This commit is contained in:
Thomas Waldmann 2017-10-20 21:13:11 +02:00
parent 38dd1f11ac
commit 7136e2c93c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -687,7 +687,7 @@ def find_key(self):
id = self.repository.id id = self.repository.id
keyfile = os.environ.get('BORG_KEY_FILE') keyfile = os.environ.get('BORG_KEY_FILE')
if keyfile: if keyfile:
return self.sanity_check(keyfile, id) return self.sanity_check(os.path.abspath(keyfile), id)
keys_dir = get_keys_dir() keys_dir = get_keys_dir()
for name in os.listdir(keys_dir): for name in os.listdir(keys_dir):
filename = os.path.join(keys_dir, name) filename = os.path.join(keys_dir, name)
@ -700,7 +700,7 @@ def find_key(self):
def get_new_target(self, args): def get_new_target(self, args):
keyfile = os.environ.get('BORG_KEY_FILE') keyfile = os.environ.get('BORG_KEY_FILE')
if keyfile: if keyfile:
return keyfile return os.path.abspath(keyfile)
filename = args.location.to_key_filename() filename = args.location.to_key_filename()
path = filename path = filename
i = 1 i = 1