From b635dd79bdc7682422e956bbdd87be95dff461d2 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 1 Aug 2012 09:18:06 -0400 Subject: fixed display of wrong ACLs --- src/lib/Bcfg2/Client/Tools/POSIX.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') 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))) -- cgit v1.2.3-1-g7c22