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

[sa...@apache.org]

Author: sarowe
Date: Fri Mar 23 23:47:55 2012
New Revision: 1304662

URL: http://svn.apache.org/viewvc?rev=1304662&view=rev
Log:
Enable comparisons between Solr distribution artifact names (apache-solr-*) and those of Maven artifacts (solr-*)

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

Modified: lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py?rev=1304662&r1=1304661&r2=1304662&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py Fri Mar 23 23:47:55 2012
@@ -571,7 +571,10 @@ def checkIdenticalMavenArtifacts(distrib
   for project in ('lucene', 'solr'):
     distFilenames = dict()
     for file in distributionFiles[project]:
-      distFilenames[os.path.basename(file)] = file
+      baseName = os.path.basename(file)
+      if project == 'solr': # Remove 'apache-' prefix to allow comparison to Maven artifacts
+        baseName = baseName.replace('apache-', '')
+      distFilenames[baseName] = file
     for artifact in artifacts[project]:
       if reJarWar.search(artifact):
         if artifact not in nonMavenizedDeps.keys():