diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2012-08-26 17:59:27 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2012-08-26 17:59:27 -0500 |
commit | 3923ecf5bbcc3e8836313f94e724ece1a3a5f705 (patch) | |
tree | 41dde25901930d8a35223abdd4fc4ec3f4383040 | |
parent | a002543375bc9a10c5bae9753a7e0a222693c313 (diff) | |
parent | 3bf68b82314eef47d2713d2c609cf93c719edeec (diff) | |
download | bcfg2-3923ecf5bbcc3e8836313f94e724ece1a3a5f705.tar.gz bcfg2-3923ecf5bbcc3e8836313f94e724ece1a3a5f705.tar.bz2 bcfg2-3923ecf5bbcc3e8836313f94e724ece1a3a5f705.zip |
Merge https://github.com/dikim33/bcfg2
-rwxr-xr-x | tools/accounts2xml.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/accounts2xml.py b/tools/accounts2xml.py index 0f7624f7d..749f3b68c 100755 --- a/tools/accounts2xml.py +++ b/tools/accounts2xml.py @@ -92,9 +92,10 @@ def main(args): item = doc.createElement(node_user) root_element.appendChild(item) extra_groups = os.popen("groups %s" % row[0]).readline()[:-1] + p_group = os.popen("id -gn %s" % row[0]).readline()[:-1] extra_groups_str = extra_groups.split(' : ')[1] populate_groups(groups, extra_groups_str) - item.setAttribute('extra_groups', extra_groups_str) + item.setAttribute('extra_groups', get_extra_group_str(extra_groups_str, p_group)) create_col_nodes(columns, item, doc, row) for gkey, gval in groups.items(): @@ -109,6 +110,12 @@ def main(args): print("Done: Created %s" % output_file) os.remove(filename) + +def get_extra_group_str(group_str, p_group): + groups = group_str.split(' ') + groups = [x for x in groups if p_group != x] + return ' '.join(groups) + def create_col_nodes(cols, item, doc, row): for col in cols: |