From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Tue, 21 Sep 2010 16:25:21 +0000 (+0000)
Subject: Recorded rollback of revisions 84902 via svnmerge from
X-Git-Tag: v2.7.1rc1~255
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63e9b5065337778cf069964743c3c7aca60e2000;p=python

Recorded rollback of revisions 84902 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 64d15e23e5..dfa9bd6ac8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -334,8 +334,6 @@ Build
 
 - Issue #1633863: Don't ignore $CC under AIX.
 
-- Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows)
-
 - Issue #9810: Compile bzip2 source files in python's project file
   directly. It used to be built with bzip2's makefile.
 
diff --git a/PC/VC6/build_ssl.py b/PC/VC6/build_ssl.py
index c78a4655b6..3e96a5b5bb 100644
--- a/PC/VC6/build_ssl.py
+++ b/PC/VC6/build_ssl.py
@@ -173,12 +173,12 @@ def main():
             #    os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile)
 
             fix_makefile(makefile)
-            shutil.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
-            shutil.copy2(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
+            shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
+            shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
 
         # Now run make.
-        shutil.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
-        shutil.copy2(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
+        shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
+        shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
 
         #makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
         makeCommand = "nmake /nologo -f \"%s\"" % makefile
diff --git a/PC/VS8.0/build_ssl.py b/PC/VS8.0/build_ssl.py
index 58de423106..ab5fcea8f5 100644
--- a/PC/VS8.0/build_ssl.py
+++ b/PC/VS8.0/build_ssl.py
@@ -220,8 +220,8 @@ def main():
             if arch == "amd64":
                 create_makefile64(makefile, m32)
             fix_makefile(makefile)
-            shutil.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
-            shutil.copy2(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
+            shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
+            shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
 
         # Now run make.
         if arch == "amd64":
@@ -230,8 +230,8 @@ def main():
                 print("ml64 assembler has failed.")
                 sys.exit(rc)
 
-        shutil.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
-        shutil.copy2(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
+        shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
+        shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
 
         #makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
         makeCommand = "nmake /nologo -f \"%s\"" % makefile
diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
index 42c0017f9d..7fbacaf59f 100644
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -226,8 +226,8 @@ def main():
             if arch == "amd64":
                 create_makefile64(makefile, m32)
             fix_makefile(makefile)
-            shutil.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
-            shutil.copy2(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
+            shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
+            shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
 
         # Now run make.
         if arch == "amd64":
@@ -236,8 +236,8 @@ def main():
                 print("ml64 assembler has failed.")
                 sys.exit(rc)
 
-        shutil.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
-        shutil.copy2(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
+        shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
+        shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
 
         #makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
         makeCommand = "nmake /nologo -f \"%s\"" % makefile