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().
This commit is contained in:
Zackery Spytz 2019-05-31 10:43:13 -06:00 committed by Steve Dower
parent 4612671df2
commit c8d5bf6c3f
3 changed files with 12 additions and 1 deletions

View File

@ -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

View File

@ -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

View File

@ -0,0 +1,2 @@
:meth:`msilib.Directory.start_component()` no longer fails if *keyfile* is
not ``None``.