From 9fc5df4a62894a2a1b5b09384ea6fbdbdb935eb4 Mon Sep 17 00:00:00 2001 From: Lauri Niskanen Date: Sun, 10 Apr 2016 18:23:22 +0300 Subject: [PATCH] Fix 'borg diff' when symlink is replacing or being replaced Previously on some cases where symlink replaced something else or was replaced by something else, `borg diff` failed with `KeyError: b'source'`. This commit fixes the issue. --- borg/archiver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/borg/archiver.py b/borg/archiver.py index 77f1a6267..8f7120037 100644 --- a/borg/archiver.py +++ b/borg/archiver.py @@ -471,7 +471,7 @@ def compare_link(item1, item2): return 'added link' elif item2.get(b'deleted'): return 'removed link' - elif item1[b'source'] != item2[b'source']: + elif b'source' in item1 and b'source' in item2 and item1[b'source'] != item2[b'source']: return 'changed link' def contents_changed(item1, item2):