add correct usage stuff

(Logical change 1.242)


git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1010 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 8 insertions, 3 deletions

diff --git a/tools/ValidateBcfg2Repo b/tools/ValidateBcfg2Repo
index d4d980b5c..33833bea2 100644
--- a/tools/ValidateBcfg2Repo
+++ b/tools/ValidateBcfg2Repo
@@ -3,17 +3,22 @@
 from glob import glob
 from sys import argv, exit
 from validate import validate, ValidationException
+from ConfigParser import ConfigParser, NoOptionError
 
 if __name__ == '__main__':
+    cf = ConfigParser()
+    cf.read(['/etc/bcfgd.conf'])
     try:
+        repo = cf.get('server', 'repository')
+    except NoOptionError:
+        if len(argv) == 1:
+            print "Usage: validate_repo <repo directory>"
+            raise SystemExit, 1
         repo = argv[1]
         if len(argv) == 3:
             schemadir = argv[2]
         else:
             schemadir = '/usr/share/bcfg2/schemas'
-    except:
-        print "Usage: validate_repo <repo directory> <schema directory>"
-        exit(1)
 
     # add more validation as more schemas get written
     filesets = {'metadata':("%s/etc/metadata.xml", "%s/metadata.xsd"),