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 9a801063c7f01d5604e7b48b8eac1b41a4eafa94..814f4418c1fa88af286ee7cc293ce1ece4e20402 100644 (file)
--- 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 ()