From f4c98421e85646740ed6de866740e23c0b37523c1e7d3d97b09b28bbc5920c73 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 21 Mar 2012 17:00:36 +0000 Subject: [PATCH] - fix false positives for swp matching OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=109 --- CheckFilelist.py | 7 +++---- rpmlint.changes | 5 +++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CheckFilelist.py b/CheckFilelist.py index 1e74d89..b53bd40 100644 --- a/CheckFilelist.py +++ b/CheckFilelist.py @@ -139,7 +139,7 @@ _checks = [ 'bad': [ '*~', '*.bak', - '*.swp', + '*/.*.swp', ], 'ignorefileif': ghostfile, }, @@ -389,9 +389,8 @@ class FilelistCheck(AbstractCheck.AbstractCheck): if 'ignorefileif' in check: if check['ignorefileif'](pkg, f): continue - if (not isinstance(b, str) and b.match(f)) or b == f: - m = msg % { 'file':f } - printError(pkg, error, m) + if (not isinstance(b, str) and b.match(f)) or b == f: + printError(pkg, error, msg % { 'file':f } ) invalidfhs = set() invalidopt = set() diff --git a/rpmlint.changes b/rpmlint.changes index 0065791..f7a7026 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 21 17:59:23 CET 2012 - dmueller@suse.de + +- fix false positives for swp matching + ------------------------------------------------------------------- Tue Mar 20 08:32:33 UTC 2012 - lnussel@suse.de