diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-04-14 08:48:14 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-04-14 08:48:14 -0400 |
| commit | 31e91d3b8a8a11c60c6f0bb005ac6f680949b01d (patch) | |
| tree | 09576914b3b47c01e788b57a38b19e156747bfc3 /src | |
| parent | 7cebd3f47926453bdac2b3f2c41804ac83358388 (diff) | |
| download | bcfg2-31e91d3b8a8a11c60c6f0bb005ac6f680949b01d.tar.gz bcfg2-31e91d3b8a8a11c60c6f0bb005ac6f680949b01d.tar.bz2 bcfg2-31e91d3b8a8a11c60c6f0bb005ac6f680949b01d.zip | |
only check for multiple default groups if groups.xml is included in validation
Diffstat (limited to 'src')
| -rwxr-xr-x | src/sbin/bcfg2-repo-validate | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/sbin/bcfg2-repo-validate b/src/sbin/bcfg2-repo-validate index e1fc9a86d..ee79e218a 100755 --- a/src/sbin/bcfg2-repo-validate +++ b/src/sbin/bcfg2-repo-validate @@ -149,15 +149,14 @@ if __name__ == '__main__': ref_bundles.add("%s/Bundler/%s" % (repo, bundle.get('name'))) # check for multiple default group definitions - default_groups = [] - for grp in lxml.etree.parse("%s/Metadata/groups.xml" \ - % repo).findall('.//Group'): - if grp.get('default') == 'true': - default_groups.append(grp) - if len(default_groups) > 1: - logging.warn("*** Warning: Multiple default groups defined") - for grp in default_groups: - logging.warn(" %s", grp.get('name')) + if "%s/Metadata/groups.xml" % repo in metadata_list: + default_groups = [g for g in lxml.etree.parse("%s/Metadata/groups.xml" % + repo).findall('.//Group') + if g.get('default') == 'true'] + if len(default_groups) > 1: + logging.warn("*** Warning: Multiple default groups defined") + for grp in default_groups: + logging.warn(" %s", grp.get('name')) # verify attributes for configuration entries # (as defined in doc/server/configurationentries) |