forked from pool/rpmlint
Ludwig Nussel
bda5d592a2
- add script update_git.sh based on qemu's to simplify importing a patch series from git after rebasing. * Patches dropped: 0001-Python-3-compatibility-tweaks.patch (upstream) 0001-Set-Python-3.4-magic-number-to-3310.patch (upstream) add-scoring-support.diff (different upstream solution) check-buildroot-during-install.diff (need to fix no-cleaning-of-buildroot check upstream) fix-versioned-prereq.diff (was disabled, not sure what it's useful for) ignore-non-readable-in-etc.diff (filtered anyways) locale-support.diff (drop) locale-update.diff (different upstream solution now) more-verbose-lsb-check.diff (drop) perl-versioned-rpath-deps.diff (upstream) rpmlint-1.5-disallow-var-run-and-var-lock.diff (upstream) rpmlint-1.5-Fix-setgroups-error-name.diff (upstream) rpmlint-decode-fix.diff (different upstream solution) rpmlint-fix-unexpanded-macros-for-array-values.patch (different upstream solution) stricter-tags-check.diff (merged in weak deps and check-for-self-provides.diff) suppress-for-perl-python.diff (use filter instead) suse-binary-info-compile-opts.diff (drop) suse-changelog.patch (change config instead) suse-mono-deps-checks.diff (useful?) suse-required-lsb-tags.diff (different upstream solution) verify-buildrequires.diff (very build system specific, drop) xdg-check-exception.diff (upstream) * renamed patches: script-interpreter-only-for-exec-scripts.diff -> script-interpreter-only-for-exec-sc.diff confusing-invalid-spec-name.patch OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=317
113 lines
3.6 KiB
Diff
113 lines
3.6 KiB
Diff
From 33fa1e8f8c1917d82d26c419321efb7ba9eddc48 Mon Sep 17 00:00:00 2001
|
|
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(-)
|
|
|
|
diff --git a/Config.py b/Config.py
|
|
index f27607c..b4e19cc 100644
|
|
--- a/Config.py
|
|
+++ b/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):
|
|
@@ -133,8 +144,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)
|
|
@@ -144,11 +160,24 @@ _non_named_group_re = re.compile('[^\\](\()[^:]')
|
|
|
|
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)):
|
|
@@ -160,9 +189,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
|