From: Greg Ward <gward@python.net>
Date: Sat, 22 Apr 2000 03:11:17 +0000 (+0000)
Subject: Catch DistutilsOptionError in 'setup()' -- it's thrown either because of
X-Git-Tag: v2.0b1~1981
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ddad73bca9072b3d4228c3d12965dbae72db2b46;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Lib/distutils/core.py b/Lib/distutils/core.py
index 9a801063c7f0..814f4418c1fa 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 ()