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

[Tim Peters]

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

Modified Files:
	python20.wse 
Log Message:
Back off to HKCU (instead of HKLM) if user doesn't have "NT adminstrator
privileges".  Untested except on Win98SE (where Wise writes to HKLM).


Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** python20.wse	2000/09/01 07:54:04	1.10
--- python20.wse	2000/09/01 11:45:02	1.11
***************
*** 51,55 ****
  item: End Block
  end
! item: Check Configuration
    Message=Sorry, but we can not install Python on your system unless you have Administrator Privileges.
    Message=
--- 51,55 ----
  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=
***************
*** 982,985 ****
--- 982,991 ----
    New Value=%MAINDIR%\pyc.ico
  end
+ item: Remark
+   Text=Write to HKLM for admin, else HKCU.  Keep these blocks otherwise identical!
+ end
+ item: Check Configuration
+   Flags=10111111
+ end
  item: Edit Registry
    Key=Software\Python\PythonCore\CurrentVersion
***************
*** 1010,1015 ****
--- 1016,1060 ----
    Root=2
  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
+   Key=Software\Python\PythonCore\CurrentVersion
+   Root=129
+ end
+ item: Edit Registry
+   Key=Software\Python\PythonCore\%PY_VERSION%\InstallPath
+   New Value=%MAINDIR%
+   Root=1
+ end
+ item: Edit Registry
+   Key=Software\Python\PythonCore\%PY_VERSION%\InstallPath\InstallGroup
+   New Value=%GROUP%
+   Root=1
+ end
+ item: Edit Registry
+   Key=Software\Python\PythonCore\%PY_VERSION%\PythonPath
+   New Value=%MAINDIR%\Lib\plat-win;%MAINDIR%\Lib;%MAINDIR%\DLLs;%MAINDIR%\Lib\lib-tk
+   Root=1
+ end
+ item: Edit Registry
+   Key=Software\Python\PythonCore\%PY_VERSION%\Modules
+   Root=1
+ end
+ item: Edit Registry
+   Key=Software\Microsoft\Windows\CurrentVersion\App Paths\Python.exe
+   New Value=%MAINDIR%\Python.exe
+   Root=1
+ end
  item: End Block
  end
+ item: End Block
+ end
  item: If/While Statement
    Variable=COMPONENTS
***************
*** 1017,1024 ****
--- 1062,1084 ----
    Flags=00001010
  end
+ item: Remark
+   Text=Write to HKLM for admin, else HKCU.  Keep these blocks otherwise identical!
+ end
+ item: Check Configuration
+   Flags=10111111
+ end
  item: Edit Registry
    Key=Software\Python\PythonCore\%PY_VERSION%\Help\Main Python Documentation
    New Value=%MAINDIR%\Doc\index.html
    Root=2
+ end
+ item: Else Statement
+ end
+ item: Edit Registry
+   Key=Software\Python\PythonCore\%PY_VERSION%\Help\Main Python Documentation
+   New Value=%MAINDIR%\Doc\index.html
+   Root=1
+ end
+ item: End Block
  end
  item: End Block