summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Client/Tools/POSIX/base.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/POSIX/base.py')
-rw-r--r--src/lib/Bcfg2/Client/Tools/POSIX/base.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
index 355f70ac9..0d3bd3c35 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
@@ -188,8 +188,13 @@ class POSIXTool(Bcfg2.Client.Tools.Tool):
err = sys.exc_info()[1]
if err.errno == 95:
# fs is mounted noacl
- self.logger.error("POSIX: Cannot set ACLs on filesystem "
- "mounted without ACL support: %s" % path)
+ if entry.findall("ACL"):
+ self.logger.error("POSIX: Cannot set ACLs on filesystem "
+ "mounted without ACL support: %s" % path)
+ else:
+ # no ACLs on the entry, no ACLs on the filesystem.
+ # all is well in the world.
+ return True
else:
self.logger.error("POSIX: Error getting current ACLS on %s: %s"
% (path, err))