Dirk Mueller
1cdbc13b57
* test: Skip fedoradev GPG checks at least for now * test: Refresh fedora* packages on image build * test: Use assertEqual where appropriate, thanks to flake8/hacking * test: Update fedora24 config to fedora26, run it on Travis * Add a new test for tmpfiles.d snippets in the /etc/ tree. * Add new tests for systemd units and udev rules in /etc/ tree * test: Disable hacking for now until it's flake8 3.4+ compatible * test: Set up flake8-bugbear, enable it in fedoradev container * rpmlint: Avoid unused loop control variable * ZipCheck: Add TODO * *: Avoid mutable argument defaults * Be aware of -debugsource packages * rpmdiff: Fix unused variable from previous commit * rpmdiff: Support soft dependencies * BinariesCheck, FilesCheck: Ignore various .build-id dirs * Add python3-devel and rpm-build to fedoradev container to provoke some issues * BinariesCheck: Popen env consistency fix * Pkg.getstatusoutput: Set LC_ALL for all Popens, defaulting to C * rpmlint: Fix checking specfile from stdin * test.sh: Extract rpmlint command to run_rpmlint * Revert "Remove unused spec_lines check_spec argument" * BinariesCheck: Trivial cleanups * travis: Run make install too * FilesCheck: Allow multiple bytecode magic values per Python version * tests: Make output test tools easier to reuse * FilesCheck: hg.python.org -> github.com/python * Pkg: Return vendor and distribution as unicode strings * FilesCheck: Add Python 3.7 bytecode magic value * Pkg.b2s: Add some more test cases OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=482
112 lines
3.6 KiB
Diff
112 lines
3.6 KiB
Diff
From: Some One <nobody@opensuse.org>
|
|
Date: Thu, 9 Apr 2015 14:55:38 +0200
|
|
Subject: [PATCH] suse-filter-exception.diff
|
|
|
|
===================================================================
|
|
---
|
|
Config.py | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
|
|
1 file changed, 54 insertions(+), 7 deletions(-)
|
|
|
|
Index: rpmlint-rpmlint-1.10/Config.py
|
|
===================================================================
|
|
--- rpmlint-rpmlint-1.10.orig/Config.py
|
|
+++ rpmlint-rpmlint-1.10/Config.py
|
|
@@ -114,12 +114,23 @@ def getOption(name, default=""):
|
|
_filters = []
|
|
_filters_re = None
|
|
|
|
+_filters_non_except = []
|
|
+_filters_non_except_re = None
|
|
+
|
|
+_filters_except = []
|
|
+_filters_except_re = None
|
|
|
|
def addFilter(s):
|
|
global _filters_re
|
|
+ global _filters_except
|
|
+
|
|
+ if len(_filters_except):
|
|
+ _filters.append(s)
|
|
+ _filters_re = None
|
|
+ else:
|
|
+ _filters_non_except.append(s)
|
|
+ _filters_non_except_re = None
|
|
|
|
- _filters.append(s)
|
|
- _filters_re = None
|
|
|
|
|
|
def removeFilter(s):
|
|
@@ -137,8 +148,13 @@ _scoring = {}
|
|
|
|
|
|
def setBadness(s, score):
|
|
+ global _scoring
|
|
_scoring[s] = score
|
|
|
|
+def setFilterException(s):
|
|
+ global _filters_except
|
|
+
|
|
+ _filters_except.append(s)
|
|
|
|
def badness(s):
|
|
return _scoring.get(s, 0)
|
|
@@ -149,11 +165,24 @@ _non_named_group_re = re.compile(r'[^\\]
|
|
|
|
def isFiltered(s):
|
|
global _filters_re
|
|
+ global _filters_except
|
|
+ global _filters_except_re
|
|
+ global _filters_non_except
|
|
+ global _filters_non_except_re
|
|
|
|
- if _filters_re is None:
|
|
- # no filter
|
|
- if len(_filters) == 0:
|
|
- return False
|
|
+ if _filters_non_except_re == None and len(_filters_non_except):
|
|
+ _filters_non_except_re = '(?:' + _filters_non_except[0] + ')'
|
|
+
|
|
+ for idx in range(1, len(_filters_non_except)):
|
|
+ # to prevent named group overflow that happen when there is too
|
|
+ # many () in a single regexp: AssertionError: sorry, but this
|
|
+ # version only supports 100 named groups
|
|
+ if '(' in _filters_non_except[idx]:
|
|
+ _non_named_group_re.subn('(:?', _filters_non_except[idx])
|
|
+ _filters_non_except_re = _filters_non_except_re + '|(?:' + _filters_non_except[idx] +')'
|
|
+ _filters_non_except_re = re.compile(_filters_non_except_re)
|
|
+
|
|
+ if _filters_re == None and len(_filters):
|
|
_filters_re = '(?:' + _filters[0] + ')'
|
|
|
|
for idx in range(1, len(_filters)):
|
|
@@ -165,9 +194,27 @@ def isFiltered(s):
|
|
_filters_re = _filters_re + '|(?:' + _filters[idx] + ')'
|
|
_filters_re = re.compile(_filters_re)
|
|
|
|
+ if _filters_except_re == None and len(_filters_except):
|
|
+ _filters_except_re = '(?:' + _filters_except[0] + ')'
|
|
+
|
|
+ for idx in range(1, len(_filters_except)):
|
|
+ # to prevent named group overflow that happen when there is too
|
|
+ # many () in a single regexp: AssertionError: sorry, but this
|
|
+ # version only supports 100 named groups
|
|
+ if '(' in _filters_except[idx]:
|
|
+ _non_named_group_re.subn('(:?', _filters_except[idx])
|
|
+ _filters_except_re = _filters_except_re + '|(?:' + _filters_except[idx] +')'
|
|
+ _filters_except_re = re.compile(_filters_except_re)
|
|
+
|
|
if not no_exception:
|
|
- if _filters_re.search(s):
|
|
+
|
|
+ if _filters_non_except_re and _filters_non_except_re.search(s):
|
|
return True
|
|
+ if _filters_except_re and _filters_except_re.search(s):
|
|
+ return False
|
|
+ if _filters_re and _filters_re.search(s):
|
|
+ return True
|
|
+
|
|
return False
|
|
|
|
# Config.py ends here
|