Client/Tools/POSIX: catch multiple VerifyDirectory calls

If a directory should be pruned from all unknown files VerifyDirectory
created a new entry each call and the second fails because the
file was already removed.

1 files changed, 9 insertions, 2 deletions

diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/Directory.py b/src/lib/Bcfg2/Client/Tools/POSIX/Directory.py
index 675a4461a..ceb360d7e 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/Directory.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/Directory.py
@@ -11,6 +11,10 @@ class POSIXDirectory(POSIXTool):
     """ Handle <Path type='directory' ...> entries """
     __req__ = ['name', 'mode', 'owner', 'group']
 
+    def __init__(self, logger, setup, config):
+        super(POSIXDirectory, self).__init__(logger, setup, config)
+        self.prune_list = list()
+
     def verify(self, entry, modlist):
         ondisk = self._exists(entry)
         if not ondisk:
@@ -27,8 +31,10 @@ class POSIXDirectory(POSIXTool):
             try:
                 extras = [os.path.join(entry.get('name'), ent)
                           for ent in os.listdir(entry.get('name'))
-                          if os.path.join(entry.get('name'),
-                                          ent) not in modlist]
+                          if (os.path.join(entry.get('name'),
+                                           ent) not in modlist and
+                              os.path.join(entry.get('name'),
+                                           ent) not in self.prune_list)]
                 if extras:
                     prune = False
                     msg = "Directory %s contains extra entries: %s" % \
@@ -37,6 +43,7 @@ class POSIXDirectory(POSIXTool):
                     entry.set('qtext', entry.get('qtext', '') + '\n' + msg)
                     for extra in extras:
                         Bcfg2.Client.XML.SubElement(entry, 'Prune', name=extra)
+                    self.prune_list += extras
             except OSError:
                 prune = True