From 676e5cec8cd057f1ba404e6af2a4fd1453bdd36c Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 30 Jul 2009 03:31:09 +0000 Subject: 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 git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5394 ce84e21b-d406-0410-9b95-82705330c041 --- src/sbin/bcfg2-repo-validate | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src') 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) -- cgit v1.2.3-1-g7c22