diff options
| author | Éric Araujo <merwok@netwok.org> | 2012-03-07 20:50:06 +0100 |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2012-03-07 20:50:06 +0100 |
| commit | 2bcd796fc967ecc7e46a7ec7ba4e191e8f4cc5e6 (patch) | |
| tree | a8c10bc206d95188abd315eadb8addb0dc6c953d /Lib/distutils | |
| parent | 276900effffb6ba305b367ce938fb5891d1c814b (diff) | |
| parent | 5eac256ef2e834df4614e72b57e930c9c21807d0 (diff) | |
| download | cpython-2bcd796fc967ecc7e46a7ec7ba4e191e8f4cc5e6.tar.gz | |
Merge 3.2
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/command/bdist_msi.py | 2 | ||||
| -rw-r--r-- | Lib/distutils/tests/test_bdist_msi.py | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/Lib/distutils/command/bdist_msi.py b/Lib/distutils/command/bdist_msi.py index fde0f63fea..b3cfe9ceff 100644 --- a/Lib/distutils/command/bdist_msi.py +++ b/Lib/distutils/command/bdist_msi.py @@ -260,7 +260,7 @@ class bdist_msi(Command): self.db.Commit() if hasattr(self.distribution, 'dist_files'): - tup = 'bdist_msi', self.target_version or 'any', installer_name + tup = 'bdist_msi', self.target_version or 'any', fullname self.distribution.dist_files.append(tup) if not self.keep_temp: diff --git a/Lib/distutils/tests/test_bdist_msi.py b/Lib/distutils/tests/test_bdist_msi.py index e599461070..15d8bdff2b 100644 --- a/Lib/distutils/tests/test_bdist_msi.py +++ b/Lib/distutils/tests/test_bdist_msi.py @@ -1,5 +1,4 @@ """Tests for distutils.command.bdist_msi.""" -import os import sys import unittest from test.support import run_unittest @@ -17,14 +16,6 @@ class BDistMSITestCase(support.TempdirManager, project_dir, dist = self.create_dist() cmd = bdist_msi(dist) cmd.ensure_finalized() - cmd.run() - - bdists = os.listdir(os.path.join(project_dir, 'dist')) - self.assertEqual(bdists, ['foo-0.1.msi']) - - # bug #13719: upload ignores bdist_msi files - self.assertEqual(dist.dist_files, - [('bdist_msi', 'any', 'dist/foo-0.1.msi')]) def test_suite(): |