[Python-checkins] cpython (merge 2.7 -> 2.7): Merged upstream changes.

[vinay.sajip]

http://hg.python.org/cpython/rev/735fdcc738a5
changeset:   90914:735fdcc738a5
branch:      2.7
parent:      90911:e5373bfbe76b
parent:      90910:f6e47d27f67a
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Fri May 30 19:05:02 2014 +0100
summary:
  Merged upstream changes.

files:
  PCbuild/pyproject.vsprops          |  2 +-
  Tools/buildbot/external-common.bat |  4 +++-
  2 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -82,7 +82,7 @@
 	/>
 	<UserMacro
 		Name="opensslDir"
-		Value="$(externalsDir)\openssl-0.9.8y"
+		Value="$(externalsDir)\openssl-1.0.1g"
 	/>
 	<UserMacro
 		Name="tcltkDir"
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -20,6 +20,7 @@
 @rem if exist db-4.4.20 rd /s/q db-4.4.20
 @rem if exist db-4.7.25.0 rd /s/q db-4.7.25.0
 @rem if exist openssl-0.9.8y rd /s/q openssl-0.9.8y
+ at rem if exist openssl-1.0.1g rd /s/q openssl-1.0.1g
 @rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21
 
 @rem bzip
@@ -33,7 +34,8 @@
 if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0
 
 @rem OpenSSL
-if not exist openssl-0.9.8y svn export http://svn.python.org/projects/external/openssl-0.9.8y
+if exist openssl-0.9.8y rd /s/q openssl-0.9.8y
+if not exist openssl-1.0.1g svn export http://svn.python.org/projects/external/openssl-1.0.1g
 
 @rem tcl/tk
 if not exist tcl-8.5.15.0 (

-- 
Repository URL: http://hg.python.org/cpython