diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-05-31 10:22:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-31 10:22:14 -0700 |
| commit | 49fc57abf5fcf60129e460046d78c9bf20a19931 (patch) | |
| tree | 5992197eaefec5118d3216a0c550c6552be16815 | |
| parent | fc3b8437c86167983cc75e5a9a3ed1dc542a1b79 (diff) | |
| download | cpython-git-49fc57abf5fcf60129e460046d78c9bf20a19931.tar.gz | |
bpo-12639: msilib.Directory.start_component() fails if *keyfile* is not None (GH-13688)
msilib.Directory.start_component() was passing an extra argument to CAB.gen_id().
(cherry picked from commit c8d5bf6c3fa09b43f6a5ee779d493d251dbcc53c)
Co-authored-by: Zackery Spytz <zspytz@gmail.com>
| -rw-r--r-- | Lib/msilib/__init__.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_msilib.py | 9 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2019-05-30-16-16-47.bpo-12639.TQFOR4.rst | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/Lib/msilib/__init__.py b/Lib/msilib/__init__.py index 8c5251d9ba..0bc8dd9952 100644 --- a/Lib/msilib/__init__.py +++ b/Lib/msilib/__init__.py @@ -273,7 +273,7 @@ class Directory: if AMD64: flags |= 256 if keyfile: - keyid = self.cab.gen_id(self.absolute, keyfile) + keyid = self.cab.gen_id(keyfile) self.keyfiles[keyfile] = keyid else: keyid = None diff --git a/Lib/test/test_msilib.py b/Lib/test/test_msilib.py index 4aa4753fc2..265eaea59b 100644 --- a/Lib/test/test_msilib.py +++ b/Lib/test/test_msilib.py @@ -83,6 +83,15 @@ class MsiDatabaseTestCase(unittest.TestCase): db.Close() self.addCleanup(unlink, db_path) + def test_directory_start_component_keyfile(self): + db, db_path = init_database() + self.addCleanup(db.Close) + feature = msilib.Feature(db, 0, 'Feature', 'A feature', 'Python') + cab = msilib.CAB('CAB') + dir = msilib.Directory(db, cab, None, TESTFN, 'TARGETDIR', + 'SourceDir', 0) + dir.start_component(None, feature, None, 'keyfile') + class Test_make_id(unittest.TestCase): #http://msdn.microsoft.com/en-us/library/aa369212(v=vs.85).aspx diff --git a/Misc/NEWS.d/next/Library/2019-05-30-16-16-47.bpo-12639.TQFOR4.rst b/Misc/NEWS.d/next/Library/2019-05-30-16-16-47.bpo-12639.TQFOR4.rst new file mode 100644 index 0000000000..aade9121b4 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-05-30-16-16-47.bpo-12639.TQFOR4.rst @@ -0,0 +1,2 @@ +:meth:`msilib.Directory.start_component()` no longer fails if *keyfile* is +not ``None``. |