Skip to content
Snippets Groups Projects
Commit 01988982 authored by Marcin Nowak's avatar Marcin Nowak :radioactive: Committed by Graeme Stewart
Browse files

merge new fixes into 20.1 branch (PyUtils-00-14-33-02)

parent 582dfd44
No related branches found
No related tags found
No related merge requests found
......@@ -258,9 +258,6 @@ def getRelease( releaseId = "12.0.3", releaseRoot = GetTagDiff.ReleaseRoot ):
id = releaseId.split(",")
#print "## id [%s] length: %i" % (str(id), len(id))
import re
lcgmatch = re.search('lcg\d?', releaseId.lower())
migmatch = re.search('mig\d\d?', releaseId.lower())
if releaseId.count("rel_") > 0 :
if releaseId.lower().count("bugfix") > 0 :
releaseRoot = os.path.join( releaseRoot, "nightlies", "bugfix" )
......@@ -272,12 +269,14 @@ def getRelease( releaseId = "12.0.3", releaseRoot = GetTagDiff.ReleaseRoot ):
releaseRoot = os.path.join( releaseRoot, "nightlies", "devval" )
elif releaseId.lower().count("dev") > 0 :
releaseRoot = os.path.join( releaseRoot, "nightlies", "dev" )
elif lcgmatch:
releaseRoot = os.path.join( releaseRoot, "nightlies", lcgmatch.group(0) )
elif migmatch:
releaseRoot = os.path.join( releaseRoot, "nightlies", migmatch.group(0) )
elif releaseId.lower().count("lcg") > 0 :
releaseRoot = os.path.join( releaseRoot, "nightlies", "lcg" )
elif releaseId.lower().count("lst") > 0 :
releaseRoot = os.path.join( releaseRoot, "nightlies", "lst" )
elif releaseId.lower().count("mig0") > 0 :
releaseRoot = os.path.join( releaseRoot, "nightlies", "mig0" )
elif releaseId.lower().count("mig1") > 0 :
releaseRoot = os.path.join( releaseRoot, "nightlies", "mig1" )
elif releaseId.lower().count("trials")> 0 :
releaseRoot = os.path.join( releaseRoot, "nightlies", "trials" )
elif releaseId.lower().count("val") > 0 :
......
......@@ -5,7 +5,7 @@
# @author Sebastien Binet
# @date February 2010
__version__ = "$Revision: 671401 $"
__version__ = "$Revision: 681272 $"
__doc__ = "check that 2 ROOT files have same content (containers and sizes)."
__author__ = "Sebastien Binet"
......@@ -116,8 +116,9 @@ def main(args):
def tree_infos(tree, args):
nentries = tree.GetEntriesFast()
leaves = [l.GetName() for l in tree.GetListOfLeaves()
if l.GetName() not in args.ignore_leaves]
# l.GetBranch().GetName() gives the full leaf path name
leaves = [l.GetBranch().GetName() for l in tree.GetListOfLeaves()
if l.GetBranch().GetName() not in args.ignore_leaves]
return {
'entries' : nentries,
'leaves': set(leaves),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment