commit 21c80f224992c204ff8365904fd13186b61b3e72
author Martin v. Löwis <martin@v.loewis.de> Mon Apr 07 21:14:19 2008 +0000
committer Martin v. Löwis <martin@v.loewis.de> Mon Apr 07 21:14:19 2008 +0000
tree d6550f239c4d325d2f29f9378ff5755064c0b542
parent 23e8db57e7213f88d68b3f7ccb8db5e3b6d9a693

Merged revisions 62207-62210 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62207 | martin.v.loewis | 2008-04-07 16:53:34 +0200 (Mo, 07 Apr 2008) | 1 line

  Delete ALLUSERS property merged from CRT merge module, so that per-user installations become possible again.
........
  r62208 | martin.v.loewis | 2008-04-07 16:54:16 +0200 (Mo, 07 Apr 2008) | 1 line

  Make private_crt feature object a global variable.
........
  r62209 | martin.v.loewis | 2008-04-07 16:55:53 +0200 (Mo, 07 Apr 2008) | 1 line

  Drop support for 7.1 CRT.
........
  r62210 | martin.v.loewis | 2008-04-07 18:34:04 +0200 (Mo, 07 Apr 2008) | 2 lines

  Make the "private CRT" case work, by editing the
  manifest in DLLs to refer to the root copy of the CRT.
........

Tools/msi/merge.py

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 @@
         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)