diff options
author | Martin v. Löwis <martin@v.loewis.de> | 2005-03-15 00:39:40 (GMT) |
---|---|---|
committer | Martin v. Löwis <martin@v.loewis.de> | 2005-03-15 00:39:40 (GMT) |
commit | 141f41ae1a38746578f3cecd204ec04b4006b9e1 (patch) | |
tree | 4167bfbcb9d18c7e3737d9d92ae356b04442dc0a /Tools/msi/msilib.py | |
parent | 1d459061a049ecea48343f490fce96ffb172b4d9 (diff) | |
download | cpython-141f41ae1a38746578f3cecd204ec04b4006b9e1.zip cpython-141f41ae1a38746578f3cecd204ec04b4006b9e1.tar.gz cpython-141f41ae1a38746578f3cecd204ec04b4006b9e1.tar.bz2 |
Reuse componentids for *.dll across minor releases.
Indicate to the user when this is an upgrade installation.
Make CHM file non-advertised.
Backported to 2.4.
Diffstat (limited to 'Tools/msi/msilib.py')
-rw-r--r-- | Tools/msi/msilib.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Tools/msi/msilib.py b/Tools/msi/msilib.py index 61715fc..8371e96 100644 --- a/Tools/msi/msilib.py +++ b/Tools/msi/msilib.py @@ -445,7 +445,7 @@ class Directory: blogical = None add_data(db, "Directory", [(logical, blogical, default)]) - def start_component(self, component = None, feature = None, flags = None, keyfile = None): + def start_component(self, component = None, feature = None, flags = None, keyfile = None, uuid=None): """Add an entry to the Component table, and make this component the current for this directory. If no component name is given, the directory name is used. If no feature is given, the current feature is used. If no flags are given, the directory's default @@ -453,7 +453,10 @@ class Directory: table.""" if flags is None: flags = self.componentflags - uuid = gen_uuid() + if uuid is None: + uuid = gen_uuid() + else: + uuid = uuid.upper() if component is None: component = self.logical self.component = component |