[Python-checkins] r47280 - in python/trunk: Lib/msilib/__init__.py Misc/NEWS
martin.v.loewis
python-checkins at python.org
Thu Jul 6 21:28:04 CEST 2006
Author: martin.v.loewis
Date: Thu Jul 6 21:28:03 2006
New Revision: 47280
Modified:
python/trunk/Lib/msilib/__init__.py
python/trunk/Misc/NEWS
Log:
Properly generate logical file ids. Fixes #1515998.
Also correct typo in Control.mapping.
Modified: python/trunk/Lib/msilib/__init__.py
==============================================================================
--- python/trunk/Lib/msilib/__init__.py (original)
+++ python/trunk/Lib/msilib/__init__.py Thu Jul 6 21:28:03 2006
@@ -187,7 +187,7 @@
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 @@
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 @@
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 @@
[(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)])
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Thu Jul 6 21:28:03 2006
@@ -25,6 +25,8 @@
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
More information about the Python-checkins
mailing list