Skip to content

Commit

Permalink
Merge CMSSW_7_6_X into CMSSW_8_0_X.
Browse files Browse the repository at this point in the history
  • Loading branch information
cmsbuild committed Oct 20, 2015
2 parents d8d49d5 + 01cf74d commit 1efc493
Showing 1 changed file with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def searchClassDefXml ():
equivList.append( (matchString, equiv) )
equivList.append( (packagesREs[packageName], packageName) )
classDict = {}
ncdict = {'class' : 'className'}
ncdict = {'class' : 'className', 'function' : 'functionName'}
for filename in xmlFiles:
if (not filename) or (ignoreSrcRE.match(filename)): continue
dupProblems = ''
Expand Down Expand Up @@ -161,6 +161,11 @@ def searchClassDefXml ():
# this isn't a real classes_def.xml file. Skip it
print "**** SKIPPING '%s' - Doesn't seem to have proper information." % filename
continue
if not classList:
classList = xmlObj.functionName
if not classList:
print "**** SKIPPING '%s' - Dosen't seem to have proper information(not class/function)." % filename
continue
for piece in classList:
try:
className = spacesRE.sub ('', piece.name)
Expand Down

0 comments on commit 1efc493

Please sign in to comment.