summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-05-07 14:17:04 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-05-07 14:17:04 -0400
commit9d6387d66c863c8525a4521258ccda136c3d6817 (patch)
treea619b2eeadebc283a6b29c6789ec1a8a8fc649f0 /src/lib/Bcfg2/Client/Tools/POSIXUsers.py
parenta430fb769d2c0c2bf880a8d572d5bb0c41435dd1 (diff)
downloadbcfg2-9d6387d66c863c8525a4521258ccda136c3d6817.tar.gz
bcfg2-9d6387d66c863c8525a4521258ccda136c3d6817.tar.bz2
bcfg2-9d6387d66c863c8525a4521258ccda136c3d6817.zip
POSIXUsers: strip whitespace from MemberOf tags
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/POSIXUsers.py')
-rw-r--r--src/lib/Bcfg2/Client/Tools/POSIXUsers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
index 99ed3c7d9..0250a1a42 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
@@ -154,7 +154,7 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool):
if entry.get("current_exists", "true") == "true":
# verify supplemental groups
actual = [g[0] for g in self.user_supplementary_groups(entry)]
- expected = [e.text for e in entry.findall("MemberOf")]
+ expected = [e.text.strip() for e in entry.findall("MemberOf")]
if set(expected) != set(actual):
entry.set('qtext',
"\n".join([entry.get('qtext', '')] +
@@ -252,7 +252,7 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool):
if entry.get('uid'):
cmd.extend(['-u', entry.get('uid')])
cmd.extend(['-g', entry.get('group')])
- extras = [e.text for e in entry.findall("MemberOf")]
+ extras = [e.text.strip() for e in entry.findall("MemberOf")]
if extras:
cmd.extend(['-G', ",".join(extras)])
cmd.extend(['-d', entry.get('home')])