summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Curtin <brian.curtin@gmail.com>2010-11-22 02:04:33 (GMT)
committerBrian Curtin <brian.curtin@gmail.com>2010-11-22 02:04:33 (GMT)
commitf213d2317cc167263bb8599e599bddc5537fed1a (patch)
tree57a34d4bb5ad13a60f1acb71304ccbbfea59bf70
parent9fd9264155169e47c5dcb5f5947490696448af38 (diff)
downloadcpython-f213d2317cc167263bb8599e599bddc5537fed1a.zip
cpython-f213d2317cc167263bb8599e599bddc5537fed1a.tar.gz
cpython-f213d2317cc167263bb8599e599bddc5537fed1a.tar.bz2
Backport the distutils part of r83399 to fix #7645.
-rw-r--r--Misc/NEWS2
-rw-r--r--Tools/msi/msi.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 8f95814..53b18d6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,8 @@ Library
Build
-----
+- Backport r83399 to allow test_distutils to pass on installed versions.
+
- Issue #1303434: Generate ZIP file containing all PDBs (already done for rc1).
- Stop packaging versioncheck tool (already done for rc1).
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index ae3b018..1a87a40 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1019,6 +1019,8 @@ def add_files(db):
lib.glob("*.pem")
lib.glob("*.pck")
lib.add_file("zipdir.zip")
+ if dir=='tests' and parent.physical=='distutils':
+ lib.add_file("Setup.sample")
if dir=='decimaltestdata':
lib.glob("*.decTest")
if dir=='output':