diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-01-16 10:44:17 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-01-16 10:45:30 -0500 |
| commit | f37833e5ea103796d5177a24901befd9b0f7ab28 (patch) | |
| tree | 9eac07ec25e14f265d28e69ef826c1df388284d1 /src | |
| parent | e3e1936fedb8d5845c576124c46677c90ca7fff2 (diff) | |
| download | bcfg2-f37833e5ea103796d5177a24901befd9b0f7ab28.tar.gz bcfg2-f37833e5ea103796d5177a24901befd9b0f7ab28.tar.bz2 bcfg2-f37833e5ea103796d5177a24901befd9b0f7ab28.zip | |
POSIX: Properly stringify ACLs with no user/group specified
This is just a workaround to avoid a traceback; the real fix will
involve making the POSIX tool properly handle ACLs with no user/group
given, which refer to the current user/group of the file they apply
to.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/base.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py index 85da3576b..3243bbf50 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py @@ -395,7 +395,10 @@ class POSIXTool(Bcfg2.Client.Tools.Tool): acl_str.append("user") elif scope == posix1e.ACL_GROUP: acl_str.append("group") - acl_str.append(qualifier) + if qualifier is None: + acl_str.append('') + else: + acl_str.append(qualifier) acl_str.append(self._acl_perm2string(perms)) return ":".join(acl_str) |