From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 7 Apr 2008 14:53:34 +0000 (+0000)
Subject: Delete ALLUSERS property merged from CRT merge module, so that per-user installations... 
X-Git-Tag: v2.6a3~251
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54d489a97f992a4ad25ce7de3e9f4a53dc2bbd0b;p=python

Delete ALLUSERS property merged from CRT merge module, so that per-user installations become possible again.
---

diff --git a/Tools/msi/merge.py b/Tools/msi/merge.py
index aa26122fc5..ff34b9354b 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)