diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-09-08 16:27:54 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-09-08 16:27:54 (GMT) |
| commit | 1c4c306626af9fa9a963caf55df2e90739152107 (patch) | |
| tree | 887108ea6f26ad02554b5125970be161a824f479 /Tools/msi/msi.py | |
| parent | 9a46cab6134eb8e575a54cd52d14eb2f679df718 (diff) | |
| download | cpython-1c4c306626af9fa9a963caf55df2e90739152107.zip cpython-1c4c306626af9fa9a963caf55df2e90739152107.tar.gz cpython-1c4c306626af9fa9a963caf55df2e90739152107.tar.bz2 | |
Merged revisions 66304-66305,66307 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66304 | martin.v.loewis | 2008-09-08 14:02:45 +0200 (Mo, 08 Sep 2008) | 2 lines
Allow passing the MSI file name to merge.py.
........
r66305 | martin.v.loewis | 2008-09-08 15:50:10 +0200 (Mo, 08 Sep 2008) | 3 lines
Issue #2271: Set SecureCustomProperties so that installation will properly
use the TARGETDIR even for unprivileged users.
........
r66307 | martin.v.loewis | 2008-09-08 18:15:38 +0200 (Mo, 08 Sep 2008) | 1 line
Add UUIDs for upcoming releases
........
Diffstat (limited to 'Tools/msi/msi.py')
| -rw-r--r-- | Tools/msi/msi.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index ff76895..66457fb 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -251,6 +251,8 @@ def remove_old_versions(db): (upgrade_code_snapshot, start, "%s.%d.0" % (major, int(minor)+1), None, migrate_features, None, "REMOVEOLDSNAPSHOT")]) props = "REMOVEOLDSNAPSHOT;REMOVEOLDVERSION" + + props += ";TARGETDIR;DLLDIR" # Installer collects the product codes of the earlier releases in # these properties. In order to allow modification of the properties, # they must be declared as secure. See "SecureCustomProperties Property" |