From 388a8c26fae0c9fdce06fcf69223b7b43cb25acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Thu, 6 Jul 2006 19:28:03 +0000 Subject: Properly generate logical file ids. Fixes #1515998. Also correct typo in Control.mapping. --- Lib/msilib/__init__.py | 10 ++++++---- Misc/NEWS | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Lib/msilib/__init__.py b/Lib/msilib/__init__.py index 0881409..4be82b0 100644 --- a/Lib/msilib/__init__.py +++ b/Lib/msilib/__init__.py @@ -187,7 +187,7 @@ class CAB: self.filenames = sets.Set() self.index = 0 - def gen_id(self, dir, file): + def gen_id(self, file): logical = _logical = make_id(file) pos = 1 while logical in self.filenames: @@ -196,9 +196,11 @@ class CAB: self.filenames.add(logical) return logical - def append(self, full, logical): + def append(self, full, file, logical): if os.path.isdir(full): return + if not logical: + logical = self.gen_id(file) self.index += 1 self.files.append((full, logical)) return self.index, logical @@ -328,7 +330,7 @@ class Directory: logical = self.keyfiles[file] else: logical = None - sequence, logical = self.cab.append(absolute, logical) + sequence, logical = self.cab.append(absolute, file, logical) assert logical not in self.ids self.ids.add(logical) short = self.make_short(file) @@ -403,7 +405,7 @@ class Control: [(self.dlg.name, self.name, event, argument, condition, ordering)]) - def mapping(self, mapping, attribute): + def mapping(self, event, attribute): add_data(self.dlg.db, "EventMapping", [(self.dlg.name, self.name, event, attribute)]) diff --git a/Misc/NEWS b/Misc/NEWS index 5e4004e..67c49a6 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -25,6 +25,8 @@ Core and builtins Library ------- +- Bug #1515998: Properly generate logical ids for files in bdist_msi. + - warnings.py now ignores ImportWarning by default - Patch #1517790: It is now possible to use custom objects in the ctypes -- cgit v0.12