summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorWulian <1055917385@qq.com>2024-10-01 14:44:18 (GMT)
committerGitHub <noreply@github.com>2024-10-01 14:44:18 (GMT)
commitda1e5526aee674bb33c17a498aa3781587b9850c (patch)
tree3aa7d67f9653bf1ffc11090264a883f92b339e00 /Tools
parent67e01a430f4ecfcb540d6a29b347966ff4e53454 (diff)
downloadcpython-da1e5526aee674bb33c17a498aa3781587b9850c.zip
cpython-da1e5526aee674bb33c17a498aa3781587b9850c.tar.gz
cpython-da1e5526aee674bb33c17a498aa3781587b9850c.tar.bz2
gh-124487: Updated installer messages and internal docs regarding minimum Windows version (GH-124822)
Diffstat (limited to 'Tools')
-rw-r--r--Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp4
-rw-r--r--Tools/msi/purge.py8
2 files changed, 2 insertions, 10 deletions
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
index 6f50200..1e0df50 100644
--- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
+++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
@@ -3100,7 +3100,7 @@ private:
} else {
BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Detected Windows Server 2003 or earlier");
}
- BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Windows Server 2012 or later is required to continue installation");
+ BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Windows Server 2016 or later is required to continue installation");
} else {
if (IsWindows10OrGreater()) {
BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Target OS is Windows 10 or later");
@@ -3116,7 +3116,7 @@ private:
} else {
BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Detected Windows XP or earlier");
}
- BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Windows 8.1 or later is required to continue installation");
+ BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Windows 10 or later is required to continue installation");
}
LocGetString(_wixLoc, L"#(loc.FailureOldOS)", &pLocString);
diff --git a/Tools/msi/purge.py b/Tools/msi/purge.py
index e25219a..4a13d36 100644
--- a/Tools/msi/purge.py
+++ b/Tools/msi/purge.py
@@ -51,14 +51,6 @@ FILES = [
"test_pdb.msi",
"tools.msi",
"ucrt.msi",
- "Windows6.0-KB2999226-x64.msu",
- "Windows6.0-KB2999226-x86.msu",
- "Windows6.1-KB2999226-x64.msu",
- "Windows6.1-KB2999226-x86.msu",
- "Windows8.1-KB2999226-x64.msu",
- "Windows8.1-KB2999226-x86.msu",
- "Windows8-RT-KB2999226-x64.msu",
- "Windows8-RT-KB2999226-x86.msu",
]
PATHS = [
"python-{}.exe".format(m.group(0)),