summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2020-08-18 21:26:17 -0400
committerGitHub <noreply@github.com>2020-08-18 21:26:17 -0400
commit8d508965e49028b68e09b930a10340ba09687d35 (patch)
treea43baa39d5e27289ce8d4db68d7b368e05ec2f27
parent675d32ff667e90d239c95359007a58cb3aa88a97 (diff)
parent84f1ba0d3c9a4125f1546d98fd44cd5d884e8af8 (diff)
downloadpython-setuptools-git-8d508965e49028b68e09b930a10340ba09687d35.tar.gz
Merge pull request #2334 from arencambre/master
Resolving error text issue (#2302)
-rw-r--r--changelog.d/2334.change.rst1
-rw-r--r--setuptools/msvc.py7
2 files changed, 5 insertions, 3 deletions
diff --git a/changelog.d/2334.change.rst b/changelog.d/2334.change.rst
new file mode 100644
index 00000000..9d3c7440
--- /dev/null
+++ b/changelog.d/2334.change.rst
@@ -0,0 +1 @@
+In MSVC module, refine text in error message.
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 24ea0863..1ead72b4 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -338,7 +338,7 @@ def _augment_exception(exc, version, arch=''):
if "vcvarsall" in message.lower() or "visual c" in message.lower():
# Special error message if MSVC++ not installed
- tmpl = 'Microsoft Visual C++ {version:0.1f} is required.'
+ tmpl = 'Microsoft Visual C++ {version:0.1f} or greater is required.'
message = tmpl.format(**locals())
msdownload = 'www.microsoft.com/download/details.aspx?id=%d'
if version == 9.0:
@@ -358,8 +358,9 @@ def _augment_exception(exc, version, arch=''):
message += msdownload % 8279
elif version >= 14.0:
# For VC++ 14.X Redirect user to latest Visual C++ Build Tools
- message += (' Get it with "Build Tools for Visual Studio": '
- r'https://visualstudio.microsoft.com/downloads/')
+ message += (' Get it with "Microsoft C++ Build Tools": '
+ r'https://visualstudio.microsoft.com'
+ r'/visual-cpp-build-tools/')
exc.args = (message, )