mirror of https://github.com/apache/lucene.git
SOLR-4766: don't compare file sizes of war/jar contents when comparing maven to binary release
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1476386 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
e53378bac6
commit
cce0cbe5ff
|
@ -1001,7 +1001,7 @@ def getZipFileEntries(fileName):
|
|||
entries = []
|
||||
with zipfile.ZipFile(fileName) as zf:
|
||||
for zi in zf.infolist():
|
||||
entries.append((zi.filename, zi.file_size))
|
||||
entries.append(zi.filename)
|
||||
# Sort by name:
|
||||
entries.sort()
|
||||
return entries
|
||||
|
@ -1026,8 +1026,8 @@ def checkIdenticalMavenArtifacts(distributionFiles, nonMavenizedDeps, artifacts,
|
|||
if binaryEntries != entries:
|
||||
raise RuntimeError('Maven artifact %s has different contents than binary distribution\n maven:\n%s\n binary:\n%s\n' % \
|
||||
(artifactFilename,
|
||||
'\n'.join(' %s [%d bytes]' % (name, size) for name, size in entries),
|
||||
'\n'.join(' %s [%d bytes]' % (name, size) for name, size in binaryEntries)))
|
||||
'\n'.join(entries),
|
||||
'\n'.join(binaryEntries)))
|
||||
|
||||
# TODO: Either fix the build to ensure that maven artifacts *are* identical, or recursively compare contents
|
||||
# identical = filecmp.cmp(artifact, distFilenames[artifactFilename], shallow=False)
|
||||
|
|
Loading…
Reference in New Issue