Merge remote-tracking branch 'origin/pr/44'

* origin/pr/44: policy/utils: fix pyinotify cleanup
QubesOS · Apr 1, 2020 · 4a21d3a · 4a21d3a
2 parents 8ffe427 + 817f9f0
commit 4a21d3a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/qrexec/policy/utils.py b/qrexec/policy/utils.py
@@ -70,10 +70,11 @@ def initialize_watcher(self):
 
     def cleanup(self):
         for wdd in self.watches:
-            self.watch_manager.rm_watch(wdd.values())
+            self.watch_manager.rm_watch(list(wdd.values()))
         self.watches = []
 
-        self.notifier.stop()
+        if self.notifier is not None:
+            self.notifier.stop()
         self.notifier = None
         self.watch_manager = None