mirror of https://github.com/borgbackup/borg.git
Merge pull request #3200 from ThomasWaldmann/keyfile-abspath-1.1
fix crash with relative BORG_KEY_FILE, fixes #3197
This commit is contained in:
commit
b994e9c9c1
|
@ -695,7 +695,7 @@ class KeyfileKey(ID_HMAC_SHA_256, KeyfileKeyBase):
|
||||||
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)
|
||||||
|
@ -708,7 +708,7 @@ class KeyfileKey(ID_HMAC_SHA_256, KeyfileKeyBase):
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue