[Python-checkins] cpython (merge 3.1 -> 3.2): merge:Do not add txt files twice

[martin.v.loewis]

http://hg.python.org/cpython/rev/83ceb26e084e
changeset:   70645:83ceb26e084e
branch:      3.2
parent:      70628:8572bf1b56ec
parent:      70643:df7b9c5d6ba1
user:        Martin v. Löwis <martin at v.loewis.de>
date:        Sun Jun 05 19:42:21 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