[Python-checkins] python/nondist/sandbox/msi msi.py,1.25,1.26

[loewis at users.sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/msi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16570

Modified Files:
	msi.py 
Log Message:
Don't install python24.dll into system32 if the user chose a per-user installation.

Index: msi.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/msi/msi.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** msi.py	5 Aug 2004 10:02:02 -0000	1.25
--- msi.py	5 Aug 2004 20:29:05 -0000	1.26
***************
*** 129,132 ****
--- 129,138 ----
  msilib.reset()
  
+ # condition in which to install pythonxy.dll in system32:
+ # a) it is Windows 9x or
+ # b) it is NT, the user is privileged, and has chosen per-machine installation
+ sys32cond = "(Windows9x or (Privileged and ALLUSERS))"
+ 
+ 
  def build_database():
      """Generate an empty database, with just the schema and the
***************
*** 333,338 ****
                ("InitialTargetDir", 'TARGETDIR=""', 750),
                # In the user interface, assume all-users installation if privileged.
!               ("SetDLLDirToSystem32", 'DLLDIR="" and Privileged', 751),
!               ("SetDLLDirToTarget", 'DLLDIR="" and not Privileged', 752),
                ("SelectDirectoryDlg", "Not Installed", 1230),
                # XXX no support for resume installations yet
--- 339,344 ----
                ("InitialTargetDir", 'TARGETDIR=""', 750),
                # In the user interface, assume all-users installation if privileged.
!               ("SetDLLDirToSystem32", 'DLLDIR="" and ' + sys32cond, 751),
!               ("SetDLLDirToTarget", 'DLLDIR="" and not ' + sys32cond, 752),
                ("SelectDirectoryDlg", "Not Installed", 1230),
                # XXX no support for resume installations yet
***************
*** 348,353 ****
      add_data(db, "InstallExecuteSequence",
              [("InitialTargetDir", 'TARGETDIR=""', 750),
!              ("SetDLLDirToSystem32", 'DLLDIR="" and (ALLUSERS and Privileged)', 751),
!              ("SetDLLDirToTarget", 'DLLDIR="" and not (ALLUSERS and Privileged)', 752),
              ])
      add_data(db, "AdminExecuteSequence",
--- 354,359 ----
      add_data(db, "InstallExecuteSequence",
              [("InitialTargetDir", 'TARGETDIR=""', 750),
!              ("SetDLLDirToSystem32", 'DLLDIR="" and ' + sys32cond, 751),
!              ("SetDLLDirToTarget", 'DLLDIR="" and not ' + sys32cond, 752),
              ])
      add_data(db, "AdminExecuteSequence",