[Python-checkins] CVS: python/dist/src/PCbuild python20.wse,1.11,1.12

[Tim Peters]

Update of /cvsroot/python/python/dist/src/PCbuild
In directory slayer.i.sourceforge.net:/tmp/cvs-serv24288/python/dist/src/pcbuild

Modified Files:
	python20.wse 
Log Message:
Guido pointed out that the "non-admin install" blurb got displayed
very late in the process when running on Windows 2000 without admim
privs.  Rearranged so that the admin check is done at the start
instead.  Added words to the end of the blurb to make it very clear
how to abort the install (wasn't obvious to me that "Cancel" was
the right thing to click).


Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** python20.wse	2000/09/01 11:45:02	1.11
--- python20.wse	2000/09/01 19:30:26	1.12
***************
*** 51,61 ****
  item: End Block
  end
! remarked item: Check Configuration
!   Message=Sorry, but we can not install Python on your system unless you have Administrator Privileges.
!   Message=
!   Message=Please log on as an Administrator, and start the installation again.
!   Title=Must have administrator rights
!   Flags=01011111
  end
  item: Set Variable
    Variable=APPTITLE
--- 51,66 ----
  item: End Block
  end
! item: Check Configuration
!   Flags=10011111
! end
! item: Display Message
!   Title=Doing non-admin install
!   Text=The current login does not have Administrator Privileges on this machine.  Python will install its registry information into the per-user area only for the current login, instead of into the per-machine area for every account on this machine.  Some advanced uses of Python may not work as a result (for example, running a Python script as a service).
!   Text=
!   Text=If this is not what you want, please click Cancel to abort this installation, log on as an Administrator, and start the installation again.
!   Flags=00001000
  end
+ item: End Block
+ end
  item: Set Variable
    Variable=APPTITLE
***************
*** 1017,1027 ****
  end
  item: Else Statement
- end
- item: Display Message
-   Title=Doing non-admin install
-   Text=The current login does not have Administrator Privileges on this machine.  Python will install its registry information into the per-user area only for the current login, instead of into the per-machine area for every account on this machine.  Some advanced uses of Python may not work as a result (for example, running a Python script as a service).
-   Text=
-   Text=If this is not what you want, please log on as an Administrator, and start the installation again.
-   Flags=00001000
  end
  item: Edit Registry
--- 1022,1025 ----