mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3200 from ThomasWaldmann/keyfile-abspath-1.1 

fix crash with relative BORG_KEY_FILE, fixes #3197
This commit is contained in:
TW 2017-10-20 23:43:46 +02:00 committed by GitHub
parent 40186a3ffc 6d67a9f874
commit b994e9c9c1
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

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