fsmonitor: fix mistyped fs_to_path_map variable

A typo was made in facfd59 when the wd_set variable was renamed to wd_to_path_map. This code path raises a NameError when inotify-watched files are removed from the filesystem: NameError: global name 'wd_to_path_set' is not defined Closes #607 Reported-by: Joshua Taylor <joshuataylorx@gmail.com> Signed-off-by: David Aguilar <davvid@gmail.com>
git-cola · Oct 11, 2016 · 08a9e55 · 08a9e55 · sthalik · Oct 19, 2016
1 parent 0cebb3c
commit 08a9e55
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/cola/fsmonitor.py b/cola/fsmonitor.py
@@ -260,7 +260,7 @@ def _refresh_watches(self, paths_to_watch, wd_to_path_map,
             watched_paths = set(path_to_wd_map)
             for path in watched_paths - paths_to_watch:
                 wd = path_to_wd_map.pop(path)
-                wd_to_path_set.pop(wd)
+                wd_to_path_map.pop(wd)
                 try:
                     inotify.rm_watch(self._inotify_fd, wd)
                 except OSError as e:

diff --git a/share/doc/git-cola/relnotes.rst b/share/doc/git-cola/relnotes.rst
@@ -75,6 +75,10 @@ Fixes
 
   https://github.com/git-cola/git-cola/issues/604
 
+* Fixed a typo in the inotify backend that is triggered when files are removed.
+
+  https://github.com/git-cola/git-cola/issues/607
+
 .. _v2.8:
 
 git-cola v2.8