POSIX: fixed removal of symlinked directories

3 files changed, 26 insertions, 31 deletions

diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/Directory.py b/src/lib/Bcfg2/Client/Tools/POSIX/Directory.py
index 9b0b998bb..9d0fe05e0 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/Directory.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/Directory.py
@@ -3,7 +3,6 @@
 import os
 import sys
 import stat
-import shutil
 import Bcfg2.Client.XML
 from Bcfg2.Client.Tools.POSIX.base import POSIXTool
 
@@ -67,25 +66,14 @@ class POSIXDirectory(POSIXTool):
             rv &= self._makedirs(entry)
 
         if entry.get('prune', 'false') == 'true':
-            ulfailed = False
             for pent in entry.findall('Prune'):
                 pname = pent.get('path')
-                ulfailed = False
-                if os.path.isdir(pname):
-                    remove = shutil.rmtree
-                else:
-                    remove = os.unlink
                 try:
                     self.logger.debug("POSIX: Removing %s" % pname)
-                    remove(pname)
+                    self._remove(pent)
                 except OSError:
                     err = sys.exc_info()[1]
                     self.logger.error("POSIX: Failed to unlink %s: %s" %
                                       (pname, err))
-                    ulfailed = True
-            if ulfailed:
-                # even if prune failed, we still want to install the
-                # entry to make sure that we get permissions and
-                # whatnot set
-                rv = False
+                    rv = False
         return POSIXTool.install(self, entry) and rv
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/Nonexistent.py b/src/lib/Bcfg2/Client/Tools/POSIX/Nonexistent.py
index 5f1fbbe7c..0606d47f9 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/Nonexistent.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/Nonexistent.py
@@ -2,7 +2,6 @@
 
 import os
 import sys
-import shutil
 from Bcfg2.Client.Tools.POSIX.base import POSIXTool
 
 
@@ -19,25 +18,25 @@ class POSIXNonexistent(POSIXTool):
 
     def install(self, entry):
         ename = entry.get('name')
-        if entry.get('recursive', '').lower() == 'true':
+        recursive = entry.get('recursive', '').lower() == 'true'
+        if recursive:
+            print "here"
             # ensure that configuration spec is consistent first
             for struct in self.config.getchildren():
-                for entry in struct.getchildren():
-                    if (entry.tag == 'Path' and
-                        entry.get('type') != 'nonexistent' and
-                        entry.get('name').startswith(ename)):
+                print "checking struct"
+                for el in struct.getchildren():
+                    import lxml.etree
+                    print "checking entry: %s" % lxml.etree.tostring(el)
+                    if (el.tag == 'Path' and
+                        el.get('type') != 'nonexistent' and
+                        el.get('name').startswith(ename)):
                         self.logger.error('POSIX: Not removing %s. One or '
                                           'more files in this directory are '
                                           'specified in your configuration.' %
                                           ename)
                         return False
-            remove = shutil.rmtree
-        elif os.path.isdir(ename):
-            remove = os.rmdir
-        else:
-            remove = os.remove
         try:
-            remove(ename)
+            self._remove(entry, recursive=recursive)
             return True
         except OSError:
             err = sys.exc_info()[1]
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
index a9566b698..6388f6731 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
@@ -66,18 +66,26 @@ class POSIXTool(Bcfg2.Client.Tools.Tool):
                     rv &= self._set_perms(entry, path=os.path.join(root, path))
         return rv
 
+    def _remove(self, entry, recursive=True):
+        """ Remove a Path entry, whatever that takes """
+        if os.path.islink(entry.get('name')):
+            os.unlink(entry.get('name'))
+        elif os.path.isdir(entry.get('name')):
+            if recursive:
+                shutil.rmtree(entry.get('name'))
+            else:
+                os.rmdir(entry.get('name'))
+        else:
+            os.unlink(entry.get('name'))
+
     def _exists(self, entry, remove=False):
         """ check for existing paths and optionally remove them.  if
         the path exists, return the lstat of it """
         try:
             ondisk = os.lstat(entry.get('name'))
             if remove:
-                if os.path.isdir(entry.get('name')):
-                    remove = shutil.rmtree
-                else:
-                    remove = os.unlink
                 try:
-                    remove(entry.get('name'))
+                    self._remove(entry)
                     return None
                 except OSError:
                     err = sys.exc_info()[1]