You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2014/09/21 17:31:56 UTC
svn commit: r1626597 - in /lucene/dev/branches/lucene_solr_4_10: ./
dev-tools/ dev-tools/scripts/crawl.maven.release.dist.sh
dev-tools/scripts/smokeTestRelease.py
Author: sarowe
Date: Sun Sep 21 15:31:55 2014
New Revision: 1626597
URL: http://svn.apache.org/r1626597
Log:
revert commit containing inadvertent change to dev-tools/scripts/smokeTestRelease.py
Modified:
lucene/dev/branches/lucene_solr_4_10/ (props changed)
lucene/dev/branches/lucene_solr_4_10/dev-tools/ (props changed)
lucene/dev/branches/lucene_solr_4_10/dev-tools/scripts/crawl.maven.release.dist.sh
lucene/dev/branches/lucene_solr_4_10/dev-tools/scripts/smokeTestRelease.py
Modified: lucene/dev/branches/lucene_solr_4_10/dev-tools/scripts/crawl.maven.release.dist.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/dev-tools/scripts/crawl.maven.release.dist.sh?rev=1626597&r1=1626596&r2=1626597&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/dev-tools/scripts/crawl.maven.release.dist.sh (original)
+++ lucene/dev/branches/lucene_solr_4_10/dev-tools/scripts/crawl.maven.release.dist.sh Sun Sep 21 15:31:55 2014
@@ -29,9 +29,8 @@ if [ -z "$1" ] ; then
fi
# Resolve redirects, e.g. from URL shortening, e.g. http://s.apache.org/lusolr36rc1
-# Also trim trailing slashes, if any, from the resolved URL.
RC_URL=`(echo "Location: $1" ; wget -l 1 --spider "$1" 2>&1) \
- | perl -ne '$url=$1 if (/Location:\s*(\S+)/); END { $url =~ s~/+$~~; print $url; }'`
+ | perl -ne '$url=$1 if (/Location:\s*(\S+)/); END { print "$url" if ($url); }'`
if [ -d lucene ] ; then
echo "Please remove directory ./lucene/ before running this script."
@@ -40,29 +39,13 @@ elif [ -d solr ] ; then
echo "Please remove directory ./solr/ before running this script."
exit 1;
fi
-
mkdir lucene
cd lucene
-
-# -r : recurse
-# -np : "no parents": only download below the given URL
-# -l 0 : infinite recursion (no limit on recursive crawling depth)
-# -nH : "no Hostname" output directory - use only path elements
-# -erobots=off : ignore robots.txt
-# --cut-dirs=5: Don't create output directories for the first 5 path elements, e.g.
-# /~acct/staging_area/lucene-solr-X.Y.Z-RCM-revNNNNNNN/lucene/maven/org/apache/lucene/...
-# 1 2 3 4 5 6 7 8 9
-# ^- Dirs start here
-wget -r -np -l 0 -nH -erobots=off --cut-dirs=5 \
+wget -r -np -l 0 -nH -erobots=off --cut-dirs=8 \
--reject="*.md5,*.sha1,maven-metadata.xml*,index.html*" "${RC_URL}/lucene/maven/"
-
cd ..
-
mkdir solr
cd solr
-
-wget -r -np -l 0 -nH -erobots=off --cut-dirs=5 \
+wget -r -np -l 0 -nH -erobots=off --cut-dirs=8 \
--reject="*.md5,*.sha1,maven-metadata.xml*,index.html*" "${RC_URL}/solr/maven/"
-
cd ..
-
Modified: lucene/dev/branches/lucene_solr_4_10/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/dev-tools/scripts/smokeTestRelease.py?rev=1626597&r1=1626596&r2=1626597&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/lucene_solr_4_10/dev-tools/scripts/smokeTestRelease.py Sun Sep 21 15:31:55 2014
@@ -135,16 +135,7 @@ def download(name, urlString, tmpDir, qu
print(' already done: %.1f MB' % (os.path.getsize(fileName)/1024./1024.))
return
try:
- while True:
- openSuccessful = False
- try:
- fIn = urllib.request.urlopen(urlString)
- openSuccessful = True
- finally:
- if openSuccessful:
- break
- print(' Retrying to urlopen %s' % urlString)
-
+ fIn = urllib.request.urlopen(urlString)
fOut = open(fileName, 'wb')
success = False
try: