|
[Rivet-svn] r2271 - trunk/binblackhole at projects.hepforge.org blackhole at projects.hepforge.orgThu Feb 25 16:55:40 GMT 2010
Author: fsiegert Date: Thu Feb 25 16:55:38 2010 New Revision: 2271 Log: fix exits in rivet-mkhtml. Modified: trunk/bin/rivet-mkhtml Modified: trunk/bin/rivet-mkhtml ============================================================================== --- trunk/bin/rivet-mkhtml Thu Feb 25 13:52:46 2010 (r2270) +++ trunk/bin/rivet-mkhtml Thu Feb 25 16:55:38 2010 (r2271) @@ -48,13 +48,13 @@ pass if not refpaths: print "Error: Didn't find rivet-config. Have you sourced rivetenv.sh?" - exit(1) + sys.exit(1) try: os.makedirs(opts.OUTPUTDIR) except: print "Error: Directory '%s' already exists. Set -o to something else." % opts.OUTPUTDIR - exit(1) + sys.exit(1) ## get set of analyses/reffiles involved in the runs analyses = set() @@ -63,8 +63,8 @@ for aidafile in aidafiles: aidafilepath = os.path.abspath(aidafile.split(":")[0]) if not os.access(aidafilepath, os.R_OK): - print "Error: cannot read from %s" % aidafile.split(":")[0] - exit(2) + print "Error: cannot read from %s" % aidafilepath + sys.exit(2) tree = ET.parse(aidafilepath) for dps in tree.findall("dataPointSet"): path = dps.get("path")
More information about the Rivet-svn mailing list |