summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-01 09:18:06 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-01 11:28:25 -0400
commitb635dd79bdc7682422e956bbdd87be95dff461d2 (patch)
tree26665f41cf04733ffbc7d98195bc6fe607218232 /src
parent7fade0c29c926f28537217576a496b653f092cca (diff)
downloadbcfg2-b635dd79bdc7682422e956bbdd87be95dff461d2.tar.gz
bcfg2-b635dd79bdc7682422e956bbdd87be95dff461d2.tar.bz2
bcfg2-b635dd79bdc7682422e956bbdd87be95dff461d2.zip
fixed display of wrong ACLs
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Client/Tools/POSIX.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX.py b/src/lib/Bcfg2/Client/Tools/POSIX.py
index 0f7618d33..0615fbece 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX.py
@@ -1142,7 +1142,8 @@ class POSIX(Bcfg2.Client.Tools.Tool):
if aclkey not in existing:
missing.append(acl_str)
elif existing[aclkey] != perms:
- wrong.append((acl_str, existing[aclkey]))
+ wrong.append((acl_str,
+ self._acl2string(aclkey, existing[aclkey])))
for aclkey, perms in existing.items():
if aclkey not in wanted:
@@ -1155,7 +1156,7 @@ class POSIX(Bcfg2.Client.Tools.Tool):
if wrong:
msg.append("%s ACLs are wrong: %s" %
(len(wrong),
- "; ".join(["%s, should be %s" % (w, e)
+ "; ".join(["%s should be %s" % (e, w)
for w, e in wrong])))
if extra:
msg.append("%s extra ACLs: %s" % (len(extra), ", ".join(extra)))