diff options
| author | Sol Jerome <solj@ices.utexas.edu> | 2009-07-30 03:31:09 +0000 |
|---|---|---|
| committer | Sol Jerome <solj@ices.utexas.edu> | 2009-07-30 03:31:09 +0000 |
| commit | 676e5cec8cd057f1ba404e6af2a4fd1453bdd36c (patch) | |
| tree | 6cd9950c8a3ab5434d9400db60b82d4aab68907f | |
| parent | c7db9500b42648e6172f333bd1c23c70f3b2fb63 (diff) | |
| download | bcfg2-676e5cec8cd057f1ba404e6af2a4fd1453bdd36c.tar.gz bcfg2-676e5cec8cd057f1ba404e6af2a4fd1453bdd36c.tar.bz2 bcfg2-676e5cec8cd057f1ba404e6af2a4fd1453bdd36c.zip | |
bcfg2-repo-validate: Fix for ticket #699 from Mike McCallister
Only check for info.xml files in directories where they are known to
exist.
Signed-off-by: Sol Jerome <solj@ices.utexas.edu>
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5394 ce84e21b-d406-0410-9b95-82705330c041
| -rwxr-xr-x | src/sbin/bcfg2-repo-validate | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/sbin/bcfg2-repo-validate b/src/sbin/bcfg2-repo-validate index cb9caca6e..a59254a80 100755 --- a/src/sbin/bcfg2-repo-validate +++ b/src/sbin/bcfg2-repo-validate @@ -28,12 +28,11 @@ if __name__ == '__main__': # Get a list of all info.xml files in the bcfg2 repository info_list = [] - for root, dirs, files in os.walk('%s' % repo): - for filename in files: - if filename == 'info.xml': - info_list.append(os.path.join(root, filename)) - if 'Bundler' in dirs: - dirs.remove('Bundler') + for infodir in ['Cfg', 'TGenshi', 'TCheetah']: + for root, dirs, files in os.walk('%s/%s' % (repo, infodir)): + for filename in files: + if filename == 'info.xml': + info_list.append(os.path.join(root, filename)) # get metadata list (with all included files) metadata_list = glob.glob("%s/Metadata/groups.xml" % repo) |