diff options
author | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-10-27 23:12:01 (GMT) |
---|---|---|
committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-10-27 23:12:01 (GMT) |
commit | c7c71ff87cf4e8083aaae9564d2f1785f36fd3dc (patch) | |
tree | a0a94a9aca7306448297d3a5afedc4e6cec6190e /Lib/distutils/core.py | |
parent | 70ec8ee2ed718de3ce3c6b47238cc6e688b87f7c (diff) | |
download | cpython-c7c71ff87cf4e8083aaae9564d2f1785f36fd3dc.zip cpython-c7c71ff87cf4e8083aaae9564d2f1785f36fd3dc.tar.gz cpython-c7c71ff87cf4e8083aaae9564d2f1785f36fd3dc.tar.bz2 |
Merged revisions 75893 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75893 | tarek.ziade | 2009-10-28 00:06:10 +0100 (Wed, 28 Oct 2009) | 1 line
Fixed #1180: Option to ignore ~/.pydistutils.cfg in Distutils
........
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 6e48920..95c0357 100644 --- a/Lib/distutils/core.py +++ b/Lib/distutils/core.py @@ -129,8 +129,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: |