summaryrefslogtreecommitdiffstats
path: root/Tools/msi/msi.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-06-19 14:38:02 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-06-19 14:38:02 (GMT)
commit12f2bffce1be0e36e2cf11a8be80de7fcb76dd54 (patch)
tree1f37a3639480738daf90d359dbc239ac664860f3 /Tools/msi/msi.py
parentdefe6f61fe8595d0d2cc194c120ef0b3dc3a4286 (diff)
parent2510d9e8d9d3244c8d35efdd01bca265755655de (diff)
downloadcpython-12f2bffce1be0e36e2cf11a8be80de7fcb76dd54.zip
cpython-12f2bffce1be0e36e2cf11a8be80de7fcb76dd54.tar.gz
cpython-12f2bffce1be0e36e2cf11a8be80de7fcb76dd54.tar.bz2
merge heads
Diffstat (limited to 'Tools/msi/msi.py')
-rw-r--r--Tools/msi/msi.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 18638eb..de1a623 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1057,14 +1057,14 @@ def add_files(db):
lib.add_file("turtle.cfg")
if dir=="pydoc_data":
lib.add_file("_pydoc.css")
- if dir=="data" and parent.physical=="test" and parent.basedir.physical=="email":
+ if dir=="data" and parent.physical=="test_email":
# This should contain all non-.svn files listed in subversion
for f in os.listdir(lib.absolute):
if f.endswith(".txt") or f==".svn":continue
if f.endswith(".au") or f.endswith(".gif"):
lib.add_file(f)
else:
- print("WARNING: New file %s in email/test/data" % f)
+ print("WARNING: New file %s in test/test_email/data" % f)
for f in os.listdir(lib.absolute):
if os.path.isdir(os.path.join(lib.absolute, f)):
pydirs.append((lib, f))