[Python-checkins] python/nondist/sandbox/msi msilib.py,1.7,1.8

loewis at users.sourceforge.net loewis at users.sourceforge.net
Tue Jul 20 10:52:51 CEST 2004


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

Modified Files:
	msilib.py 
Log Message:
Check for version 2 of MSI merge.

Index: msilib.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/msi/msilib.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** msilib.py	1 Feb 2004 18:03:36 -0000	1.7
--- msilib.py	20 Jul 2004 08:52:48 -0000	1.8
***************
*** 4,8 ****
  import win32com.client.gencache
  import win32com.client
! import pythoncom
  from win32com.client import constants
  import re, string, os, sets, glob, popen2, sys, _winreg
--- 4,8 ----
  import win32com.client.gencache
  import win32com.client
! import pythoncom, pywintypes
  from win32com.client import constants
  import re, string, os, sets, glob, popen2, sys, _winreg
***************
*** 54,58 ****
  
  def EnsureMSM():
!     win32com.client.gencache.EnsureModule('{0ADDA82F-2C26-11D2-AD65-00A0C9AF11A6}', 0, 1, 0)
  
  _Installer=None
--- 54,61 ----
  
  def EnsureMSM():
!     try:
!         win32com.client.gencache.EnsureModule('{0ADDA82F-2C26-11D2-AD65-00A0C9AF11A6}', 0, 1, 0)
!     except pywintypes.com_error:
!         win32com.client.gencache.EnsureModule('{0ADDA82F-2C26-11D2-AD65-00A0C9AF11A6}', 0, 2, 0)
  
  _Installer=None



More information about the Python-checkins mailing list