diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-23 10:58:02 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-23 10:58:02 -0400 |
| commit | d1e8d4652a30343d29d482163fa71f93ad03ec4d (patch) | |
| tree | 788aefc1674dbc4cdcd3e4f98a1cb1b4c8664191 /tools | |
| parent | 8c4fbd1e8429937847adc98a4487b7367a218ce7 (diff) | |
| parent | 5b2af26603d3ea01378561429179cdd895c42ec0 (diff) | |
| download | bcfg2-d1e8d4652a30343d29d482163fa71f93ad03ec4d.tar.gz bcfg2-d1e8d4652a30343d29d482163fa71f93ad03ec4d.tar.bz2 bcfg2-d1e8d4652a30343d29d482163fa71f93ad03ec4d.zip | |
Merge branch 'maint'
Conflicts:
src/lib/Bcfg2/Server/Plugins/GroupLogic.py
src/lib/Bcfg2/Server/Plugins/Metadata.py
tools/posixusers_baseline.py
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/posixusers_baseline.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/posixusers_baseline.py b/tools/posixusers_baseline.py index 1f89c7cb6..06925beed 100755 --- a/tools/posixusers_baseline.py +++ b/tools/posixusers_baseline.py @@ -2,6 +2,7 @@ import grp import sys +import logging import lxml.etree import Bcfg2.Logger import Bcfg2.Options @@ -22,6 +23,7 @@ class CLI(object): components=[self, POSIXUsers]).parse() config = lxml.etree.Element("Configuration") self.users = POSIXUsers(config) + self.logger = logging.getLogger('posixusers_baseline.py') def run(self): baseline = lxml.etree.Element("Bundle", name="posixusers_baseline") @@ -34,7 +36,13 @@ class CLI(object): continue entry.set(attr, str(data[idx])) if entry.tag == 'POSIXUser': - entry.set("group", grp.getgrgid(data[3])[0]) + try: + entry.set("group", grp.getgrgid(data[3])[0]) + except KeyError: + self.logger.warning( + "User %s is a member of nonexistent group %s" % + (entry.get("name"), data[3])) + entry.set("group", str(data[3])) for group in self.users.user_supplementary_groups(entry): lxml.etree.SubElement(entry, "MemberOf", group=group[0]) |