diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-28 15:02:04 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-28 15:02:08 -0400 |
| commit | 2056440e2f898e307ba2b766754a89dcb5486ba8 (patch) | |
| tree | fac9ed54a03f916842800a9992fc02c5a53c8f76 /src/lib/Bcfg2/Client/Tools/POSIX/base.py | |
| parent | fb7e6c1f0eafddfa91aee2344857d7df1df959c2 (diff) | |
| download | bcfg2-2056440e2f898e307ba2b766754a89dcb5486ba8.tar.gz bcfg2-2056440e2f898e307ba2b766754a89dcb5486ba8.tar.bz2 bcfg2-2056440e2f898e307ba2b766754a89dcb5486ba8.zip | |
if an entry has no acls and its filesystem is mounted noacl, that's not an error
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/POSIX/base.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/base.py | 9 |
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)) |