From f208804668ee24b1c2c82f237c6cf9890dc11e65 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Fri, 11 Jul 2008 02:49:12 +0000 Subject: Fix complete entry delete paths for Cfg/TCheetah/TGenshi (issue reported by SolJ) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4774 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugin.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/lib/Server/Plugin.py') 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''' -- cgit v1.2.3-1-g7c22