summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-04-07 14:53:34 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-04-07 14:53:34 (GMT)
commit54d489a97f992a4ad25ce7de3e9f4a53dc2bbd0b (patch)
tree99555589aa89b07490aefbc82f647f1d563204a5 /Tools
parent528576031d9655ca8004260a2bf2c783f77d1da1 (diff)
downloadcpython-54d489a97f992a4ad25ce7de3e9f4a53dc2bbd0b.zip
cpython-54d489a97f992a4ad25ce7de3e9f4a53dc2bbd0b.tar.gz
cpython-54d489a97f992a4ad25ce7de3e9f4a53dc2bbd0b.tar.bz2
Delete ALLUSERS property merged from CRT merge module, so that per-user installations become possible again.
Diffstat (limited to 'Tools')
-rw-r--r--Tools/msi/merge.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/Tools/msi/merge.py b/Tools/msi/merge.py
index aa26122..ff34b93 100644
--- a/Tools/msi/merge.py
+++ b/Tools/msi/merge.py
@@ -65,6 +65,11 @@ def merge(msi, feature, rootdir, modules):
msilib.add_stream(db, stream, cabname)
os.unlink(cabname)
maxmedia += count
+ # The merge module sets ALLUSERS to 1 in the property table.
+ # This is undesired; delete that
+ v = db.OpenView("DELETE FROM Property WHERE Property='ALLUSERS'")
+ v.Execute(None)
+ v.Close()
db.Commit()
merge(msi, "SharedCRT", "TARGETDIR", modules)