Dirk Mueller
1d8d6856a8
* Avoid exception on inaccessible scripts * Print out the error content on UnicodeError to make flake8 happy * Fix flake8 warning about missing space around operators * Use compressions when checking for backup files * Account for arch specific code in /usr/share * Check for installed libtool wrapper files * Check for missing optional dependencies * Consider gnome help for doc files * Check for noarch package with files in lib64 * Verify if description is longer than summary * Explicitly tell users how to set URL * Ignore pytest_cache directory * confusing-invalid-spec-name * Ignore orig/rej leftovers after patching * Reenable Travis testing against Fedora Rawhide * Check all sections that should not use %buildroot in them * Put in default buildroot value used by Fedora/openSUSE * Stricter interpreter check * Use compileall to avoid %buildroot to be in pyc * Drop deprecated config file usage, 0.88 is pretty old anyway * Adjust Version to not print outdated Copyright * Rework Travis checks against latest Centos and Fedora releases * Fix exception handling * Fix various flake8-import-order test regressions * Blacklist newer pycodestyle warnings * Fix compatibility with file 5.33+ * Python 3.7.0b5 magic number is 3394 * Update TagsCheck.py * pyc related tests: DRY OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=648
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.11/Config.py
|
|
===================================================================
|
|
--- rpmlint-rpmlint-1.11.orig/Config.py
|
|
+++ rpmlint-rpmlint-1.11/Config.py
|
|
@@ -111,12 +111,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):
|
|
@@ -134,8 +145,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)
|
|
@@ -146,11 +162,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)):
|
|
@@ -162,9 +191,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
|