diff --git a/buildLogAnalyzer.py b/buildLogAnalyzer.py index 9aa7f41de3a5..fa7445d3d3c5 100755 --- a/buildLogAnalyzer.py +++ b/buildLogAnalyzer.py @@ -490,7 +490,12 @@ def analyzeFile(self, fileNameIn): }, { str( - "^gmake: \\*\\*\\* .*?/src/" + subsys + "/" + pkg + "/bin/(.*?)/lib\1\\." + shLib + "^gmake: \\*\\*\\* .*?/src/" + + subsys + + "/" + + pkg + + "/bin/(.*?)/lib\1\\." + + shLib ): ["linkError", "for shared library %s in bin"] }, { @@ -505,7 +510,12 @@ def analyzeFile(self, fileNameIn): }, { str( - "^gmake: \\*\\*\\* .*?/src/" + subsys + "/" + pkg + "/test/(.*?)/.*?\\." + shLib + "^gmake: \\*\\*\\* .*?/src/" + + subsys + + "/" + + pkg + + "/test/(.*?)/.*?\\." + + shLib ): ["linkError", "for shared library %s in test"] }, { @@ -521,7 +531,9 @@ def analyzeFile(self, fileNameIn): ] }, { - str("^gmake: \\*\\*\\* .*?/src/" + subsys + "/" + pkg + "/test/(.*?)\\." + shLib): [ + str( + "^gmake: \\*\\*\\* .*?/src/" + subsys + "/" + pkg + "/test/(.*?)\\." + shLib + ): [ "linkError", "for shared library %s in test", ] @@ -539,7 +551,9 @@ def analyzeFile(self, fileNameIn): ] }, { - str("^gmake: \\*\\*\\* .*?/src/" + subsys + "/" + pkg + "/plugins/(.*?)/.*?\\.o"): [ + str( + "^gmake: \\*\\*\\* .*?/src/" + subsys + "/" + pkg + "/plugins/(.*?)/.*?\\.o" + ): [ "compError", "for plugin %s in plugins", ] @@ -567,7 +581,9 @@ def analyzeFile(self, fileNameIn): {str("^TypeError: .*"): ["pythonError", "type error in module"]}, {str("^ValueError: .*"): ["pythonError", "value error in module"]}, { - str("^gmake: \\*\\*\\* .*?/src/" + subsys + "/" + pkg + "/test/data/download\\.url"): [ + str( + "^gmake: \\*\\*\\* .*?/src/" + subsys + "/" + pkg + "/test/data/download\\.url" + ): [ "dwnlError", "for file in data/download.url in test", ] @@ -591,7 +607,9 @@ def analyzeFile(self, fileNameIn): }, { str( - "^ *(/.*?/" + self.release + "/|)src/.*?\\([0-9]+\\)\\: warning #[0-9]+-[A-Z]: " + "^ *(/.*?/" + + self.release + + "/|)src/.*?\\([0-9]+\\)\\: warning #[0-9]+-[A-Z]: " ): [ "compWarning", "for file in release", @@ -653,7 +671,9 @@ def analyzeFile(self, fileNameIn): ] miscErrRe = re.compile("^gmake: \\*\\*\\* (.*)$") - genericLinkErrRe = re.compile("^gmake: \\*\\*\\* \\[tmp/.*?/lib.*?" + shLib + "\\] Error 1") + genericLinkErrRe = re.compile( + "^gmake: \\*\\*\\* \\[tmp/.*?/lib.*?" + shLib + "\\] Error 1" + ) if "_gcc46" in os.environ["SCRAM_ARCH"]: errorInf.append( diff --git a/cmsutils.py b/cmsutils.py index 514942f62e78..66034a7aa836 100644 --- a/cmsutils.py +++ b/cmsutils.py @@ -127,7 +127,8 @@ def doCmd(cmd, dryRun=False, inDir=None, debug=True): def getIBReleaseInfo(rel): m = re.match( - "^CMSSW_(\\d+_\\d+(_[A-Z][A-Za-z0-9]+|))_X(_[A-Z]+|)_(\\d\\d\\d\\d-\\d\\d-\\d\\d-(\\d\\d)\\d\\d)", rel + "^CMSSW_(\\d+_\\d+(_[A-Z][A-Za-z0-9]+|))_X(_[A-Z]+|)_(\\d\\d\\d\\d-\\d\\d-\\d\\d-(\\d\\d)\\d\\d)", + rel, ) if not m: return ("", "", "")