forked from pool/rpmlint
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
60 lines
2.4 KiB
Diff
60 lines
2.4 KiB
Diff
From: Some One <nobody@opensuse.org>
|
|
Date: Thu, 9 Apr 2015 14:55:38 +0200
|
|
Subject: [PATCH] suse-filter-more-verbose.diff
|
|
|
|
===================================================================
|
|
---
|
|
Config.py | 25 +++++++++++++++++++++++--
|
|
1 file changed, 23 insertions(+), 2 deletions(-)
|
|
|
|
Index: rpmlint-rpmlint-1.10/Config.py
|
|
===================================================================
|
|
--- rpmlint-rpmlint-1.10.orig/Config.py
|
|
+++ rpmlint-rpmlint-1.10/Config.py
|
|
@@ -10,6 +10,7 @@
|
|
import locale
|
|
import os.path
|
|
import re
|
|
+import sys
|
|
|
|
try:
|
|
from __version__ import __version__
|
|
@@ -180,7 +181,17 @@ def isFiltered(s):
|
|
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)
|
|
+ try:
|
|
+ _filters_non_except_re = re.compile(_filters_non_except_re)
|
|
+ except Exception:
|
|
+ # Try to figure out which filter caused the error
|
|
+ for f in _filters_non_except[1:]:
|
|
+ try:
|
|
+ re.compile(f)
|
|
+ except Exception as e:
|
|
+ # can't use Pkg.error/warn here, as that would recurse
|
|
+ print >> sys.stderr, "(none): E: %s in filter '%s'" % (e.message, f)
|
|
+ sys.exit(2)
|
|
|
|
if _filters_re == None and len(_filters):
|
|
_filters_re = '(?:' + _filters[0] + ')'
|
|
@@ -192,7 +203,17 @@ def isFiltered(s):
|
|
if '(' in _filters[idx]:
|
|
_non_named_group_re.subn('(:?', _filters[idx])
|
|
_filters_re = _filters_re + '|(?:' + _filters[idx] + ')'
|
|
- _filters_re = re.compile(_filters_re)
|
|
+ try:
|
|
+ _filters_re = re.compile(_filters_re)
|
|
+ except Exception:
|
|
+ # Try to figure out which filter caused the error
|
|
+ for f in _filters[1:]:
|
|
+ try:
|
|
+ re.compile(f)
|
|
+ except Exception as e:
|
|
+ # can't use Pkg.error/warn here, as that would recurse
|
|
+ print >> sys.stderr, "(none): E: %s in filter '%s'" % (e.message, f)
|
|
+ sys.exit(2)
|
|
|
|
if _filters_except_re == None and len(_filters_except):
|
|
_filters_except_re = '(?:' + _filters_except[0] + ')'
|