summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2007-11-20 23:38:09 (GMT)
committerChristian Heimes <christian@cheimes.de>2007-11-20 23:38:09 (GMT)
commit5d14c2b8f87b23a9257c97b5f98dd097ca289c78 (patch)
treee7f70d363ad656494d995fce4e74e95ba70ca688 /Tools
parent81e8ab5ba074694750072fb50081b77da16180a0 (diff)
downloadcpython-5d14c2b8f87b23a9257c97b5f98dd097ca289c78.zip
cpython-5d14c2b8f87b23a9257c97b5f98dd097ca289c78.tar.gz
cpython-5d14c2b8f87b23a9257c97b5f98dd097ca289c78.tar.bz2
Merged revisions 59056-59076 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r59064 | christian.heimes | 2007-11-20 02:48:48 +0100 (Tue, 20 Nov 2007) | 1 line Fixed bug #1470 ........ r59066 | martin.v.loewis | 2007-11-20 03:46:02 +0100 (Tue, 20 Nov 2007) | 2 lines Patch #1468: Package Lib/test/*.pem. ........ r59068 | christian.heimes | 2007-11-20 04:21:02 +0100 (Tue, 20 Nov 2007) | 1 line Another fix for test_shutil. Martin pointed out that it breaks some build bots ........ r59073 | nick.coghlan | 2007-11-20 15:55:57 +0100 (Tue, 20 Nov 2007) | 1 line Backport some main.c cleanup from the py3k branch ........ r59076 | amaury.forgeotdarc | 2007-11-21 00:31:27 +0100 (Wed, 21 Nov 2007) | 6 lines The incremental decoder for utf-7 must preserve its state between calls. Solves issue1460. Might not be a backport candidate: a new API function was added, and some code may rely on details in utf-7.py. ........
Diffstat (limited to 'Tools')
-rw-r--r--Tools/msi/msi.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index dffd02e..45f5a2e 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -974,6 +974,7 @@ def add_files(db):
lib.add_file("check_soundcard.vbs")
lib.add_file("empty.vbs")
lib.glob("*.uue")
+ lib.glob("*.pem")
lib.add_file("readme.txt", src="README")
if dir=='decimaltestdata':
lib.glob("*.decTest")