Apache Solr open-source search software
LUCENE-10107 Read multi-line commit from Manifest (#2575)
Mike Drob2291d90f9c67
diff --git a/dev-tools/scripts/buildAndPushRelease.py b/dev-tools/scripts/buildAndPushRelease.pyindex 21861cb5811..62010f06653 100755--- a/dev-tools/scripts/buildAndPushRelease.py+++ b/dev-tools/scripts/buildAndPushRelease.py@@ -344,7 +344,11 @@ def main():print('Next run the smoker tester:')p = re.compile(".*/")m = p.match(sys.argv[0])- print('%s -u %ssmokeTestRelease.py %s' % (sys.executable, m.group(), url))+ if not c.sign:+ signed = "--not-signed"+ else:+ signed = ""+ print('%s -u %ssmokeTestRelease.py %s %s' % (sys.executable, m.group(), signed, url))if __name__ == '__main__':try:diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.pyindex eca6e65d821..3db19ead344 100755--- a/dev-tools/scripts/smokeTestRelease.py+++ b/dev-tools/scripts/smokeTestRelease.py@@ -169,11 +169,15 @@ def checkJARMetaData(desc, jarFile, gitRevision, version):if gitRevision != 'skip':# Make sure this matches the version and git revision we think we are releasing:- # TODO: LUCENE-7023: is it OK that Implementation-Version's value now spans two lines?- verifyRevision = 'Implementation-Version: %s %s' % (version, gitRevision)- if s.find(verifyRevision) == -1:- raise RuntimeError('%s is missing "%s" inside its META-INF/MANIFEST.MF (wrong git revision?)' % \+ match = re.search("Implementation-Version: (.+\r\n .+)", s, re.MULTILINE)+ if match:+ implLine = match.group(1).replace("\r\n ", "")+ verifyRevision = '%s %s' % (version, gitRevision)+ if implLine.find(verifyRevision) == -1:+ raise RuntimeError('%s is missing "%s" inside its META-INF/MANIFEST.MF (wrong git revision?)' % \(desc, verifyRevision))+ else:+ raise RuntimeError('%s is missing Implementation-Version inside its META-INF/MANIFEST.MF' % desc)notice = decodeUTF8(z.read(NOTICE_FILE_NAME))license = decodeUTF8(z.read(LICENSE_FILE_NAME))