[ovs-dev] [PATCH] flake8: Fix use of --select and --ignore.

[Russell Bryant]

The flake8 command evolved over a series of patches and now includes the
use of both --select and --ignore.  Unfortunately, this wasn't doing
what I thought.  The use of --select completely overrides what --ignore
does, meaning that we were only currently enforcing a small number of
warnings specified in --select.  This patch runs flake8 twice, once with
--select and once with --ignore to actually enforce the full desired
set of warnings.

No additional violations had been introduced, but I noticed this while
working on some other patches.

Signed-off-by: Russell Bryant <russell at ovn.org>
---
 Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 0b2aa12..955217f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -365,7 +365,9 @@ ALL_LOCAL += flake8-check
 #   H233 Python 3.x incompatible use of print operator
 #   H238 old style class declaration, use new style (inherit from `object`)
 flake8-check: $(FLAKE8_PYFILES)
-	$(AM_V_GEN) if flake8 $^ --select=H231,H232,H233,H238 --ignore=E121,E123,E125,E126,E127,E128,E129,E131,W503,F811,D,H ${FLAKE8_FLAGS}; then touch $@; else exit 1; fi
+	$(AM_V_GEN) if flake8 $^ --select=H231,H232,H233,H238 ${FLAKE8_FLAGS} && \
+		flake8 $^ --ignore=E121,E123,E125,E126,E127,E128,E129,E131,W503,F811,D,H ${FLAKE8_FLAGS}; then \
+		touch $@; else exit 1; fi
 endif
 
 include $(srcdir)/manpages.mk
-- 
2.5.0