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().
diff --git a/Lib/msilib/__init__.py b/Lib/msilib/__init__.py
index 8c5251d..0bc8dd9 100644
--- a/Lib/msilib/__init__.py
+++ b/Lib/msilib/__init__.py
@@ -273,7 +273,7 @@
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 4aa4753..265eaea 100644
--- a/Lib/test/test_msilib.py
+++ b/Lib/test/test_msilib.py
@@ -83,6 +83,15 @@
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