From 6d67a9f874c31d60d481258c26480a8c60718757 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 20 Oct 2017 21:13:11 +0200 Subject: [PATCH] fix crash with relative BORG_KEY_FILE, fixes #3197 (cherry picked from commit 7136e2c93c4de7d2500dfe5f3d1e5120b58eee21) --- src/borg/crypto/key.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/borg/crypto/key.py b/src/borg/crypto/key.py index 53a4c3df9..ed1d44fe7 100644 --- a/src/borg/crypto/key.py +++ b/src/borg/crypto/key.py @@ -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