[Python-checkins] cpython (merge 3.2 -> default): merge:Do not add txt files twice
martin.v.loewis
python-checkins at python.org
Sun Jun 5 19:44:17 CEST 2011
http://hg.python.org/cpython/rev/e2a2811ec9e8
changeset: 70647:e2a2811ec9e8
parent: 70642:44139ece7a31
parent: 70646:52405ec0c8d1
user: Martin v. Löwis <martin at v.loewis.de>
date: Sun Jun 05 19:43:56 2011 +0200
summary:
merge:Do not add txt files twice
files:
Tools/msi/msi.py | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1031,8 +1031,6 @@
lib.glob("*.0")
if dir=='tests' and parent.physical=='distutils':
lib.add_file("Setup.sample")
- if dir=='cjkencodings':
- lib.glob("*.txt")
if dir=='decimaltestdata':
lib.glob("*.decTest")
if dir=='xmltestdata':
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list