summaryrefslogtreecommitdiffstats
path: root/src/sbin
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2011-04-13 11:40:50 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2011-04-13 11:40:50 -0400
commite386c37ff7436f78c1a9dd33e0c90e2b3254c99d (patch)
treea7df466017cd180d7fbf093234b9bd45d4e83abf /src/sbin
parent545dda76d34a06ae25efa2eb3d0c8c0bd70127d0 (diff)
downloadbcfg2-e386c37ff7436f78c1a9dd33e0c90e2b3254c99d.tar.gz
bcfg2-e386c37ff7436f78c1a9dd33e0c90e2b3254c99d.tar.bz2
bcfg2-e386c37ff7436f78c1a9dd33e0c90e2b3254c99d.zip
* Made Metadata files validate whether or not XIncludes had been processed
* bcfg2-repo-validate does not chase XIncludes if --stdin has been specified, but just validates the Metadata files you provide on stdin
Diffstat (limited to 'src/sbin')
-rwxr-xr-xsrc/sbin/bcfg2-repo-validate49
1 files changed, 25 insertions, 24 deletions
diff --git a/src/sbin/bcfg2-repo-validate b/src/sbin/bcfg2-repo-validate
index 271f498cd..d4eb0ffd2 100755
--- a/src/sbin/bcfg2-repo-validate
+++ b/src/sbin/bcfg2-repo-validate
@@ -30,7 +30,7 @@ if __name__ == '__main__':
if setup['stdin']:
file_list = map(lambda s: s.strip(), sys.stdin.readlines())
info_list = [f for f in file_list if os.path.basename(f) == 'info.xml']
- metadata_list = fnmatch.filter(file_list, "*/Metadata/groups.xml")
+ metadata_list = fnmatch.filter(file_list, "*/Metadata/*.xml")
clients_list = fnmatch.filter(file_list, "*/Metadata/clients.xml")
bundle_list = fnmatch.filter(file_list, "*/Bundler/*.xml")
genshibundle_list = fnmatch.filter(file_list, "*/Bundler/*.genshi")
@@ -71,24 +71,30 @@ if __name__ == '__main__':
pkgcfg_list = glob.glob("%s/Packages/config.xml" % repo)
gp_list = glob.glob('%s/GroupPatterns/config.xml' % repo)
- # include files in metadata_list
- ref_bundles = set()
- xdata = lxml.etree.parse("%s/Metadata/groups.xml" % repo)
- included = set([ent.get('href') for ent in \
- xdata.findall('./{http://www.w3.org/2001/XInclude}include')])
- while included:
- try:
- filename = included.pop()
- except KeyError:
- continue
- metadata_list.append("%s/Metadata/%s" % (repo, filename))
- groupdata = lxml.etree.parse("%s/Metadata/%s" % (repo, filename))
- group_ents = [ent.get('href') for ent in \
- groupdata.
- findall('./{http://www.w3.org/2001/XInclude}include')]
- for ent in group_ents:
- included.add(ent)
- included.discard(filename)
+ # include files in metadata_list
+ ref_bundles = set()
+ xdata = lxml.etree.parse("%s/Metadata/groups.xml" % repo)
+ included = set([ent.get('href') for ent in
+ xdata.findall('./{http://www.w3.org/2001/XInclude}include')])
+ while included:
+ try:
+ filename = included.pop()
+ except KeyError:
+ continue
+ if not setup['stdin'] or filepath in file_list:
+ metadata_list.append("%s/Metadata/%s" % (repo, filename))
+ groupdata = lxml.etree.parse("%s/Metadata/%s" % (repo, filename))
+ group_ents = [ent.get('href') for ent in \
+ groupdata.
+ findall('./{http://www.w3.org/2001/XInclude}include')]
+ for ent in group_ents:
+ included.add(ent)
+ included.discard(filename)
+
+ # get all XIncluded bundles
+ xdata.xinclude()
+ for bundle in xdata.findall("//Bundle"):
+ ref_bundles.add("%s/Bundler/%s" % (repo, bundle.get('name')))
# check for multiple default group definitions
default_groups = []
@@ -101,11 +107,6 @@ if __name__ == '__main__':
for grp in default_groups:
print(" %s" % grp.get('name'))
- # get all XIncluded bundles
- xdata.xinclude()
- for bundle in xdata.findall("//Bundle"):
- ref_bundles.add("%s/Bundler/%s" % (repo, bundle.get('name')))
-
# verify attributes for configuration entries
# (as defined in doc/server/configurationentries)
# TODO: See if it is possible to do this in the schema instead