diff options
author | Andrew Kuchling <amk@amk.ca> | 2013-11-10 23:11:00 (GMT) |
---|---|---|
committer | Andrew Kuchling <amk@amk.ca> | 2013-11-10 23:11:00 (GMT) |
commit | 2a1838b9dfa6f825ee272ec8bef683394e845830 (patch) | |
tree | 38443cd0914b1b8a763fcf7ce111f48cb7c1bf7b /Lib/distutils/core.py | |
parent | ce4179d0226768988965ac238ad15791cd377def (diff) | |
download | cpython-2a1838b9dfa6f825ee272ec8bef683394e845830.zip cpython-2a1838b9dfa6f825ee272ec8bef683394e845830.tar.gz cpython-2a1838b9dfa6f825ee272ec8bef683394e845830.tar.bz2 |
Issue #19544 and Issue #1180: Restore global option to ignore ~/.pydistutils.cfg in Distutils, accidentally removed in backout of distutils2 changes.
Diffstat (limited to 'Lib/distutils/core.py')
-rw-r--r-- | Lib/distutils/core.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/distutils/core.py b/Lib/distutils/core.py index 91e5132..c811d5b 100644 --- a/Lib/distutils/core.py +++ b/Lib/distutils/core.py @@ -128,8 +128,9 @@ def setup (**attrs): if _setup_stop_after == "config": return dist - # Parse the command line; any command-line errors are the end user's - # fault, so turn them into SystemExit to suppress tracebacks. + # Parse the command line and override config files; any + # command-line errors are the end user's fault, so turn them into + # SystemExit to suppress tracebacks. try: ok = dist.parse_command_line() except DistutilsArgError as msg: |