From d04670f08578d8be2b88d0d736c85361ec81e335 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 28 May 2012 11:25:34 -0500 Subject: POSIX: Fix symlink->dir removal (#1110) Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Client/Tools/POSIX.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/lib/Bcfg2') diff --git a/src/lib/Bcfg2/Client/Tools/POSIX.py b/src/lib/Bcfg2/Client/Tools/POSIX.py index 0d67dbbab..519e6b232 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX.py @@ -758,7 +758,10 @@ class POSIX(Bcfg2.Client.Tools.Tool): self.logger.error('Failed to remove %s: %s' % (ename, e.strerror)) else: - if os.path.isdir(ename): + if os.path.islink(ename): + os.remove(ename) + return True + elif os.path.isdir(ename): try: os.rmdir(ename) return True -- cgit v1.2.3-1-g7c22