summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Client/Tools/POSIX
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-11-07 08:44:29 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-11-07 08:44:46 -0500
commitf30b56dd103546efc664ce2bd6c219af49cb108e (patch)
tree156d6fd6a60b3a85c2b3280f5338f915f653890e /src/lib/Bcfg2/Client/Tools/POSIX
parent10eb7f52b799e6b36deeebb9b78f5d0734d9f05b (diff)
downloadbcfg2-f30b56dd103546efc664ce2bd6c219af49cb108e.tar.gz
bcfg2-f30b56dd103546efc664ce2bd6c219af49cb108e.tar.bz2
bcfg2-f30b56dd103546efc664ce2bd6c219af49cb108e.zip
POSIX: fix detection of ACLs on entry without pylibacl installed
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/POSIX')
-rw-r--r--src/lib/Bcfg2/Client/Tools/POSIX/base.py5
1 files changed, 2 insertions, 3 deletions
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")