summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Curtin <brian.curtin@gmail.com>2010-11-22 02:08:49 (GMT)
committerBrian Curtin <brian.curtin@gmail.com>2010-11-22 02:08:49 (GMT)
commit69a106ab41424dfcffb5cb7169459ea66b65ad3a (patch)
treedb6e903c11796488ca0ee1bf3cd49bd8d9b345b0
parentad36a291e002637f5af14d829d95ab6454501aee (diff)
downloadcpython-69a106ab41424dfcffb5cb7169459ea66b65ad3a.zip
cpython-69a106ab41424dfcffb5cb7169459ea66b65ad3a.tar.gz
cpython-69a106ab41424dfcffb5cb7169459ea66b65ad3a.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 fc40da5..315b556 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,8 @@ Library
Build
-----
+- Backport r83399 to allow test_distutils to pass on installed versions.
+
- Issue #1303434: Generate ZIP file containing all PDBs.
Tests
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index d988283..a1f67b8 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1020,6 +1020,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=='xmltestdata':