From 403b09ab980c02ef36095973349a13e0181c794a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Thu, 03 Nov 2016 06:01:28 +0000
Subject: [PATCH] import ipa-4.4.0-12.el7

---
 SOURCES/1005-Remove-pylint-from-build-process.patch |   37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/SOURCES/1005-Remove-pylint-from-build-process.patch b/SOURCES/1005-Remove-pylint-from-build-process.patch
index 35fd734..c37811b 100644
--- a/SOURCES/1005-Remove-pylint-from-build-process.patch
+++ b/SOURCES/1005-Remove-pylint-from-build-process.patch
@@ -1,35 +1,36 @@
-From bdee628555701a27951d7ef18b62941b5b92ec6c Mon Sep 17 00:00:00 2001
+From 0d25e3c170377cc8cbf1506c4b9db91b62261c39 Mon Sep 17 00:00:00 2001
 From: Martin Kosek <mkosek@redhat.com>
 Date: Fri, 5 Sep 2014 11:48:20 +0200
 Subject: [PATCH] Remove pylint from build process
 
 pylint is not present in RHEL-7.0.
 ---
- Makefile | 4 ----
- 1 file changed, 4 deletions(-)
+ Makefile | 12 ------------
+ 1 file changed, 12 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index abf58382960099a54b8920dd0e741b9fda17682f..7a91fbe233d588c3c8dda1bff2daf2bdd5e7717c 100644
+index 3251deba35e2129e6192bc4db599c1a07be056a7..fd1aa366cc46d29ad411a450f9ab89f5e60a5da0 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -49,9 +49,6 @@ IPA_RPM_RELEASE=$(shell cat RELEASE)
- LIBDIR ?= /usr/lib
- 
- DEVELOPER_MODE ?= 0
--ifneq ($(DEVELOPER_MODE),0)
--LINT_OPTIONS=--no-fail
--endif
- 
- PYTHON ?= $(shell rpm -E %__python || echo /usr/bin/python2)
- 
-@@ -116,7 +113,6 @@ client-dirs:
+@@ -134,18 +134,6 @@ client-dirs:
  	fi
  
  lint: bootstrap-autogen
--	./make-lint $(LINT_OPTIONS)
- 	$(MAKE) -C install/po validate-src-strings
+-	# find all python modules and executable python files outside modules for pylint check
+-	FILES=`find . \
+-		-type d -exec test -e '{}/__init__.py' \; -print -prune -o \
+-		-path '*/.*' -o \
+-		-path './dist/*' -o \
+-		-path './lextab.py' -o \
+-		-path './yacctab.py' -o \
+-		-name '*~' -o \
+-		-name \*.py -print -o \
+-		-type f -exec grep -qsm1 '^#!.*\bpython' '{}' \; -print`; \
+-	echo "Pylint is running, please wait ..."; \
+-	PYTHONPATH=. pylint --rcfile=pylintrc $(PYLINTFLAGS) $$FILES || $(LINT_IGNORE_FAIL)
+ 	$(MAKE) -C install/po validate-src-strings || $(LINT_IGNORE_FAIL)
  
  
 -- 
-2.1.0
+2.7.4
 

--
Gitblit v1.8.0