[Python-checkins] cpython (merge 2.7 -> 2.7): merge 2.7.7 release branch

[benjamin.peterson]

http://hg.python.org/cpython/rev/07a6fca7ff42
changeset:   90759:07a6fca7ff42
branch:      2.7
parent:      90754:ae89498cd66b
parent:      90758:5318bf3e70a6
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun May 18 16:33:28 2014 -0700
summary:
  merge 2.7.7 release branch

files:
  Tools/msi/msi.py |  4 ++++
  1 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1035,8 +1035,12 @@
             lib.add_file("zipdir.zip")
         if dir=='tests' and parent.physical=='distutils':
             lib.add_file("Setup.sample")
+        if dir=='audiodata':
+            lib.glob("*.*")
         if dir=='decimaltestdata':
             lib.glob("*.decTest")
+        if dir=='imghdrdata':
+            lib.glob("*.*")
         if dir=='xmltestdata':
             lib.glob("*.xml")
             lib.add_file("test.xml.out")

-- 
Repository URL: http://hg.python.org/cpython