[pywin32-checkins] pywin32/isapi install.py,1.5,1.6

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

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

Modified Files:
	install.py 
Log Message:
Allow --server to specify either a site description or a site instance ID.


Index: install.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/isapi/install.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** install.py	28 Apr 2005 22:42:19 -0000	1.5
--- install.py	24 May 2005 14:46:17 -0000	1.6
***************
*** 134,144 ****
          server = _IIS_OBJECT+"/1"
      else:
!         # Assume the user has passed a "server description" - loop over
!         # all objects until we find it.
          ob = GetObject(_IIS_OBJECT)
          look = server_desc.lower().strip()
          for sub in ob:
!             this_comment = getattr(sub, "ServerComment", "")
!             if this_comment.lower().strip() == look:
                  server = sub.AdsPath
                  break
--- 134,146 ----
          server = _IIS_OBJECT+"/1"
      else:
!         # Assume the user has passed either the instance_id or "server
!         # description" - loop over all objects until we find it.
          ob = GetObject(_IIS_OBJECT)
          look = server_desc.lower().strip()
          for sub in ob:
!             # ID is generally a number, but no need to assume that.
!             this_id = getattr(sub, "Name", "").lower().strip()
!             this_comment = getattr(sub, "ServerComment", "").lower().strip()
!             if this_id == look or this_comment == look:
                  server = sub.AdsPath
                  break