From 2056440e2f898e307ba2b766754a89dcb5486ba8 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 28 Sep 2012 15:02:04 -0400 Subject: if an entry has no acls and its filesystem is mounted noacl, that's not an error --- src/lib/Bcfg2/Client/Tools/POSIX/base.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src') 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)) -- cgit v1.2.3-1-g7c22