summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2011-04-11 08:36:08 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2011-04-11 08:36:08 -0400
commit5fb8de869e9a1a2dbf0cb07128ceb6c88bba2555 (patch)
treee20949dccfca37d61a94957cd416b928b65f3610 /src
parentee125da42e0c80614c79517f0f7df9fa6d7a9b4c (diff)
parent246557f31b1be5d73419434e2f05f7a7653de592 (diff)
downloadbcfg2-5fb8de869e9a1a2dbf0cb07128ceb6c88bba2555.tar.gz
bcfg2-5fb8de869e9a1a2dbf0cb07128ceb6c88bba2555.tar.bz2
bcfg2-5fb8de869e9a1a2dbf0cb07128ceb6c88bba2555.zip
merged upstream changes
Diffstat (limited to 'src')
-rwxr-xr-xsrc/sbin/bcfg2-repo-validate32
1 files changed, 15 insertions, 17 deletions
diff --git a/src/sbin/bcfg2-repo-validate b/src/sbin/bcfg2-repo-validate
index fea8ee157..cd71aba42 100755
--- a/src/sbin/bcfg2-repo-validate
+++ b/src/sbin/bcfg2-repo-validate
@@ -174,23 +174,22 @@ if __name__ == '__main__':
else:
pset.add(ptuple)
- filesets = {'metadata': (metadata_list, "%s/metadata.xsd"),
- 'clients': (clients_list, "%s/clients.xsd"),
- 'info': (info_list, "%s/info.xsd"),
- 'bundle': (bundle_list, "%s/bundle.xsd"),
- 'pkglist': (pkg_list, "%s/pkglist.xsd"),
- 'base': (base_list, "%s/base.xsd"),
- 'rules': (rules_list, "%s/rules.xsd"),
- 'imageinfo': (imageinfo_list, "%s/report-configuration.xsd"),
- 'services': (services_list, "%s/services.xsd"),
- 'deps': (deps_list, "%s/deps.xsd"),
- 'decisions': (dec_list, "%s/decisions.xsd"),
- 'packages': (pkgcfg_list, "%s/packages.xsd"),
- 'grouppatterns': (gp_list, "%s/grouppatterns.xsd"),
- }
+ filesets = {"%s/metadata.xsd": metadata_list,
+ "%s/clients.xsd": clients_list,
+ "%s/info.xsd": info_list,
+ "%s/bundle.xsd": bundle_list + genshibundle_list,
+ "%s/pkglist.xsd": pkg_list,
+ "%s/base.xsd": base_list,
+ "%s/rules.xsd": rules_list,
+ "%s/report-configuration.xsd": imageinfo_list,
+ "%s/services.xsd": services_list,
+ "%s/deps.xsd": deps_list,
+ "%s/decisions.xsd": dec_list,
+ "%s/packages.xsd": pkgcfg_list,
+ "%s/grouppatterns.xsd": gp_list}
failures = 0
- for k, (filelist, schemaname) in list(filesets.items()):
+ for schemaname, filelist in list(filesets.items()):
try:
schema = lxml.etree.XMLSchema(lxml.etree.parse(open(schemaname %
schemadir)))
@@ -252,5 +251,4 @@ if __name__ == '__main__':
print(" Filename is %s" % fname)
print(" Bundle name found in %s is %s" % (fname, bname))
-
- raise SystemExit, failures
+ raise SystemExit(failures)