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

diff --git a/Tools/msi/merge.py b/Tools/msi/merge.py
index aa26122fc5cdf04700833400f633c9f13f33b1b4..ff34b9354b08fffbc5a8e22d536a6ef3539cc7b6 100644 (file)
--- 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)\r
         os.unlink(cabname)\r
         maxmedia += count\r
+    # The merge module sets ALLUSERS to 1 in the property table. \r
+    # This is undesired; delete that\r
+    v = db.OpenView("DELETE FROM Property WHERE Property='ALLUSERS'")\r
+    v.Execute(None)\r
+    v.Close()\r
     db.Commit()\r
 \r
 merge(msi, "SharedCRT", "TARGETDIR", modules)\r