[Python-checkins] python/nondist/sandbox/msi msilib.py,1.4,1.5

[loewis at users.sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/msi
In directory sc8-pr-cvs1:/tmp/cvs-serv1091

Modified Files:
	msilib.py 
Log Message:
Revert language of the MSM object. Don't require cabarc.exe be part of
VC++.


Index: msilib.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/msi/msilib.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** msilib.py	7 Jan 2004 05:18:16 -0000	1.4
--- msilib.py	7 Jan 2004 20:02:26 -0000	1.5
***************
*** 54,58 ****
  
  def EnsureMSM():
!     win32com.client.gencache.EnsureModule('{0ADDA82F-2C26-11D2-AD65-00A0C9AF11A6}', 1033, 1, 0)
  
  _Installer=None
--- 54,58 ----
  
  def EnsureMSM():
!     win32com.client.gencache.EnsureModule('{0ADDA82F-2C26-11D2-AD65-00A0C9AF11A6}', 0, 1, 0)
  
  _Installer=None
***************
*** 365,369 ****
              cabarc = os.path.join(_winreg.QueryValueEx(key, v)[0], r"Bin", "cabarc.exe")
              _winreg.CloseKey(key)
!             assert os.path.exists(cabarc), cabarc
              break
          else:
--- 365,369 ----
              cabarc = os.path.join(_winreg.QueryValueEx(key, v)[0], r"Bin", "cabarc.exe")
              _winreg.CloseKey(key)
!             if not os.path.exists(cabarc):continue
              break
          else: