summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2000-09-01 19:30:26 (GMT)
committerTim Peters <tim.peters@gmail.com>2000-09-01 19:30:26 (GMT)
commit9a83b92c7528be5f5de98e553570f3cf4418f3be (patch)
tree4e53cb5e7203592edaf03c8c6542e8cae94b2703
parent6f8f92f535c57eae0174a3c76da3801be8769834 (diff)
downloadcpython-9a83b92c7528be5f5de98e553570f3cf4418f3be.zip
cpython-9a83b92c7528be5f5de98e553570f3cf4418f3be.tar.gz
cpython-9a83b92c7528be5f5de98e553570f3cf4418f3be.tar.bz2
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).
-rw-r--r--PCbuild/python20.wse24
1 files changed, 11 insertions, 13 deletions
diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index b94ffd2..aebec15 100644
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -50,12 +50,17 @@ item: Set Variable
end
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
+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,13 +1022,6 @@ item: Edit Registry
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