From f30b56dd103546efc664ce2bd6c219af49cb108e Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 7 Nov 2012 08:44:29 -0500 Subject: POSIX: fix detection of ACLs on entry without pylibacl installed --- src/lib/Bcfg2/Client/Tools/POSIX/base.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/lib') diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py index 3873c6d98..a9566b698 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py @@ -174,13 +174,12 @@ class POSIXTool(Bcfg2.Client.Tools.Tool): def _set_acls(self, entry, path=None): # pylint: disable=R0912 """ set POSIX ACLs on the file on disk according to the config """ - acls = self._list_entry_acls(entry) - if not HAS_ACLS: - if acls: + if entry.findall("ACL"): self.logger.debug("POSIX: ACLs listed for %s but no pylibacl " "library installed" % entry.get('name')) return True + acls = self._list_entry_acls(entry) if path is None: path = entry.get("name") -- cgit v1.2.3-1-g7c22