[Python-checkins] r62207 - python/trunk/Tools/msi/merge.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Mon Apr  7 16:53:34 2008
New Revision: 62207

Modified:
   python/trunk/Tools/msi/merge.py
Log:
Delete ALLUSERS property merged from CRT merge module, so that per-user installations become possible again.

Modified: python/trunk/Tools/msi/merge.py
==============================================================================
--- python/trunk/Tools/msi/merge.py	(original)
+++ python/trunk/Tools/msi/merge.py	Mon Apr  7 16:53:34 2008
@@ -65,6 +65,11 @@
         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)