summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib/Server/Plugin.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py
index bb5bd360d..6dcb67417 100644
--- a/src/lib/Server/Plugin.py
+++ b/src/lib/Server/Plugin.py
@@ -671,11 +671,14 @@ class GroupSpool(GeneratorPlugin):
self.entries[ident].handle_event(event)
if action == 'changed':
self.entries[ident].handle_event(event)
- elif action == 'deleted' and ident in self.entries:
- self.entries[ident].handle_event(event)
- if not len(self.entries[ident].entries):
- del self.entries[ident]
- del self.Entries['ConfigFile'][ident]
+ elif action == 'deleted':
+ fbase = self.handles[event.requestID] + event.filename
+ if fbase in self.entries:
+ # a directory was deleted
+ del self.entries[fbase]
+ del self.Entries['ConfigFile'][fbase]
+ else:
+ self.entries[ident].handle_event(event)
def AddDirectoryMonitor(self, relative):
'''Add new directory to FAM structures'''