summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Ward <gward@python.net>2000-04-22 03:11:17 (GMT)
committerGreg Ward <gward@python.net>2000-04-22 03:11:17 (GMT)
commitddad73bca9072b3d4228c3d12965dbae72db2b46 (patch)
treec810b36b846a8b4938af1871fb901ebc8ba66ba1
parentdb80754abcc49b8331a6da9d30c04dfcde815bc2 (diff)
downloadcpython-ddad73bca9072b3d4228c3d12965dbae72db2b46.zip
cpython-ddad73bca9072b3d4228c3d12965dbae72db2b46.tar.gz
cpython-ddad73bca9072b3d4228c3d12965dbae72db2b46.tar.bz2
Catch DistutilsOptionError in 'setup()' -- it's thrown either because of
errors in the setup script or on the command line, so shouldn't result in a traceback.
-rw-r--r--Lib/distutils/core.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/distutils/core.py b/Lib/distutils/core.py
index 9a80106..814f441 100644
--- a/Lib/distutils/core.py
+++ b/Lib/distutils/core.py
@@ -96,7 +96,9 @@ def setup (**attrs):
"error: %s: %s" % (exc.filename, exc.strerror)
else:
raise SystemExit, str (exc)
- except (DistutilsExecError, DistutilsFileError), msg:
+ except (DistutilsExecError,
+ DistutilsFileError,
+ DistutilsOptionError), msg:
raise SystemExit, "error: " + str (msg)
# setup ()