madrob commented on a change in pull request #2575:
URL: https://github.com/apache/lucene-solr/pull/2575#discussion_r712516553



##########
File path: dev-tools/scripts/smokeTestRelease.py
##########
@@ -170,11 +170,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)

Review comment:
       I'm not sure if CRLF on my machine was a Mac setting or something that 
ant or java tooling was doing. Hence the request for Windows/Linux testing 
help. But I chatted with Tim and confirmed that at least _his_ machine was also 
producing CRLF, so this wouldn't be holding up the release. I guess the correct 
expression would be `(\r\n?|\r)␣` and then would have to do something more 
intelligent with the line removal too.




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org

Reply via email to