You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2012/09/25 23:38:21 UTC
svn commit: r1390165 - in /lucene/dev/branches/branch_4x: ./ build.xml
dev-tools/ dev-tools/scripts/smokeTestRelease.py
Author: mikemccand
Date: Tue Sep 25 21:38:20 2012
New Revision: 1390165
URL: http://svn.apache.org/viewvc?rev=1390165&view=rev
Log:
LUCENE-4429: smokeTestRelease requires version is format X.Y.Z[-ALPHA|-BETA]
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/build.xml
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py
Modified: lucene/dev/branches/branch_4x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/build.xml?rev=1390165&r1=1390164&r2=1390165&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/build.xml (original)
+++ lucene/dev/branches/branch_4x/build.xml Tue Sep 25 21:38:20 2012
@@ -249,7 +249,7 @@
<property name="python32.exe" value="python3.2" />
<property name="fakeRelease" value="lucene/build/fakeRelease"/>
<property name="fakeReleaseTmp" value="lucene/build/fakeReleaseTmp"/>
- <property name="fakeReleaseVersion" value="4.1"/> <!-- *not* -SNAPSHOT, the real version -->
+ <property name="fakeReleaseVersion" value="4.1.0"/> <!-- *not* -SNAPSHOT, the real version -->
<target name="nightly-smoke" description="Builds an unsigned release and smoke tests it" depends="clean">
<sequential>
Modified: lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py?rev=1390165&r1=1390164&r2=1390165&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py Tue Sep 25 21:38:20 2012
@@ -1106,6 +1106,8 @@ def crawl(downloadedFiles, urlString, ta
downloadedFiles.append(path)
sys.stdout.write('.')
+reAllowedVersion = re.compile(r'^\d+\.\d+\.\d+(-ALPHA|-BETA)?$')
+
def main():
if len(sys.argv) < 4:
@@ -1116,6 +1118,10 @@ def main():
baseURL = sys.argv[1]
version = sys.argv[2]
+
+ if not reAllowedVersion.match(version):
+ raise RuntimeError('version "%s" does not match format X.Y.Z[-ALPHA|-BETA]' % version)
+
tmpDir = os.path.abspath(sys.argv[3])
isSigned = True
if len(sys.argv) == 5: