summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIan Cordasco <graffatcolmingov@gmail.com>2017-01-14 10:33:32 -0600
committerIan Cordasco <graffatcolmingov@gmail.com>2017-01-14 10:33:32 -0600
commita0280240fc94d834b4deb9c592255791dfea171f (patch)
tree605a2328c3f31e0f86b98f53683505140d22f024 /src
parenta761ba2901caac13141a05ef15b3c5253f96acd2 (diff)
parent2bc78e62bc036db65135e37a9bc9d7c6d6496ebe (diff)
downloadflake8-a0280240fc94d834b4deb9c592255791dfea171f.tar.gz
Merge branch 'setuptools-exit' of scop/flake8
Diffstat (limited to 'src')
-rw-r--r--src/flake8/main/setuptools_command.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/flake8/main/setuptools_command.py b/src/flake8/main/setuptools_command.py
index f6bd7a8..ba5a260 100644
--- a/src/flake8/main/setuptools_command.py
+++ b/src/flake8/main/setuptools_command.py
@@ -94,4 +94,10 @@ class Flake8(setuptools.Command):
self.flake8.report_statistics()
self.flake8.report_benchmarks()
self.flake8.formatter.stop()
- self.flake8.exit()
+ try:
+ self.flake8.exit()
+ except SystemExit as e:
+ # Cause system exit only if exit code is not zero (terminates
+ # other possibly remaining/pending setuptools commands).
+ if e.code:
+ raise