forked from pool/rpmlint
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=539
This commit is contained in:
parent
f60e9325b3
commit
72670212f7
@ -0,0 +1,33 @@
|
||||
From 534ce885e7a1529e0729dc0ae3ef75a64324583b Mon Sep 17 00:00:00 2001
|
||||
From: Dirk Mueller <dirk@dmllr.de>
|
||||
Date: Sat, 21 Oct 2017 19:24:09 +0200
|
||||
Subject: [PATCH] Accept python(abi) as a valid versioned python dependency
|
||||
|
||||
On (open)SUSE the build environment properly generates a
|
||||
requires python(abi) = x.y, so accept that to silence the warning.
|
||||
---
|
||||
FilesCheck.py | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/FilesCheck.py b/FilesCheck.py
|
||||
index abb3fa7..2ece474 100644
|
||||
--- a/FilesCheck.py
|
||||
+++ b/FilesCheck.py
|
||||
@@ -717,10 +717,10 @@ class FilesCheck(AbstractCheck.AbstractCheck):
|
||||
|
||||
if not python_dep_error:
|
||||
res = python_regex.search(f)
|
||||
- if res and not (pkg.check_versioned_dep('python-base',
|
||||
- res.group(1)) or
|
||||
- pkg.check_versioned_dep('python',
|
||||
- res.group(1))):
|
||||
+ if (res and not
|
||||
+ any((pkg.check_versioned_dep(dep, res.group(1))
|
||||
+ for dep in (
|
||||
+ 'python', 'python-base', 'python(abi)')))):
|
||||
printError(pkg, 'no-dependency-on', 'python-base',
|
||||
res.group(1))
|
||||
python_dep_error = True
|
||||
--
|
||||
2.14.2
|
||||
|
Loading…
Reference in New Issue
Block a user