svn commit: r1476386 - in /lucene/dev/trunk: ./ dev-tools/ dev-tools/scripts/smokeTestRelease.py

[mi...@apache.org]

Author: mikemccand
Date: Fri Apr 26 20:24:22 2013
New Revision: 1476386

URL: http://svn.apache.org/r1476386
Log:
SOLR-4766: don't compare file sizes of war/jar contents when comparing maven to binary release

Modified:
    lucene/dev/trunk/   (props changed)
    lucene/dev/trunk/dev-tools/   (props changed)
    lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py

Modified: lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py?rev=1476386&r1=1476385&r2=1476386&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py Fri Apr 26 20:24:22 2013
@@ -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(distrib
             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)