[pywin32-checkins] pywin32/isapi install.py,1.8,1.9

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/isapi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24682/isapi

Modified Files:
	install.py 
Log Message:
* Call the PreInstall hooks earlier so they can do more.
* Allow DefaultDocs to be set.


Index: install.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/isapi/install.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** install.py	27 Mar 2006 01:07:13 -0000	1.8
--- install.py	18 May 2006 08:32:35 -0000	1.9
***************
*** 70,77 ****
      EnableDirBrowsing = _DEFAULT_ENABLE_DIR_BROWSING
      EnableDefaultDoc  = _DEFAULT_ENABLE_DEFAULT_DOC
!     ScriptMaps       = []
      ScriptMapUpdate = "end" # can be 'start', 'end', 'replace'
      Server = None
!     
      def __init__(self, **kw):
          self.__dict__.update(kw)
--- 70,78 ----
      EnableDirBrowsing = _DEFAULT_ENABLE_DIR_BROWSING
      EnableDefaultDoc  = _DEFAULT_ENABLE_DEFAULT_DOC
!     DefaultDoc = None # Only set in IIS if not None
!     ScriptMaps = []
      ScriptMapUpdate = "end" # can be 'start', 'end', 'replace'
      Server = None
! 
      def __init__(self, **kw):
          self.__dict__.update(kw)
***************
*** 164,167 ****
--- 165,169 ----
  
  def CreateDirectory(params, options):
+     _CallHook(params, "PreInstall", options)
      if not params.Name:
          raise ConfigurationError, "No Name param"
***************
*** 180,184 ****
      else:
          keyType = _IIS_WEBVIRTUALDIR
-     _CallHook(params, "PreInstall", options)
      # We used to go to lengths to keep an existing virtual directory
      # in place.  However, in some cases the existing directories got
--- 182,185 ----
***************
*** 216,219 ****
--- 217,222 ----
      newDir.EnableDirBrowsing = params.EnableDirBrowsing
      newDir.EnableDefaultDoc  = params.EnableDefaultDoc
+     if params.DefaultDoc is not None:
+         newDir.DefaultDoc = params.DefaultDoc
      newDir.SetInfo()
      smp_items = []