From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 5 Jun 2011 17:42:21 +0000 (+0200)
Subject: merge:Do not add txt files twice
X-Git-Tag: v3.2.1rc2~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63660ce21410de669f9f3f6708556304875cee63;p=thirdparty%2FPython%2Fcpython.git

merge:Do not add txt files twice
---

63660ce21410de669f9f3f6708556304875cee63
diff --cc Tools/msi/msi.py
index 5db62cdd2469,b668c7aaec9b..53e652d57fd6
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@@ -1024,24 -1018,13 +1024,22 @@@ def add_files(db)
              lib.glob("*.uue")
              lib.glob("*.pem")
              lib.glob("*.pck")
 +            lib.glob("cfgparser.*")
 +            lib.add_file("zip_cp437_header.zip")
              lib.add_file("zipdir.zip")
 +        if dir=='capath':
 +            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':
 +            lib.glob("*.xml")
 +            lib.add_file("test.xml.out")
          if dir=='output':
              lib.glob("test_*")
 +        if dir=='sndhdrdata':
 +            lib.glob("sndhdr.*")
          if dir=='idlelib':
              lib.glob("*.def")
              lib.add_file("idle.bat")