summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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)