From 4afa9bbe3d00ec997dd255d1d93e5ce5e13d5b2a Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Sun, 14 Jun 2009 19:52:46 +0000 Subject: Improve error message for attempted directory unlinks (Patch from Torsten Rehn) (Resolves Ticket #657) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5277 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Tools/POSIX.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Client/Tools/POSIX.py index e57ee96b6..0ad9dacf6 100644 --- a/src/lib/Client/Tools/POSIX.py +++ b/src/lib/Client/Tools/POSIX.py @@ -279,6 +279,9 @@ class POSIX(Bcfg2.Client.Tools.Tool): if entry.get('prune', 'false') == 'true' and entry.get("qtest"): for pname in entry.get("qtest").split(":"): ulfailed = False + if os.path.isdir(pname): + self.logger.info("Not removing extra directory %s, please check and remove manually" % pname) + continue try: self.logger.debug("Unlinking file %s" % pname) os.unlink(pname) -- cgit v1.2.3-1-g7c22