forked from pool/rpmlint
25 lines
1.2 KiB
Diff
25 lines
1.2 KiB
Diff
|
From 0d93fa7656cb68c63c11d451d7894cac17af33e2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: StefanBruens <stefan.bruens@rwth-aachen.de>
|
||
|
|
Date: Mon, 12 Dec 2016 20:12:46 +0100
|
||
|
|
Subject: [PATCH] Readd dropped '$' in regex, fix broken check on devel
|
||
|
|
dependency
|
||
|
|
|
||
|
|
The current regex also maches "Requires: libzork-data", although it should only match e.g. "libzork1" or "zork-libs". As the latter sorts after "libzork-data", an existing correct dependency may be missed.
|
||
|
|
---
|
||
|
|
TagsCheck.py | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/TagsCheck.py b/TagsCheck.py
|
||
|
|
index fa6154c..e71d90b 100644
|
||
|
|
--- a/TagsCheck.py
|
||
|
|
+++ b/TagsCheck.py
|
||
|
|
@@ -640,7 +640,7 @@ def check(self, pkg):
|
||
|
|
base_or_libs = base + '*/' + base + '-libs/lib' + base + '*'
|
||
|
|
# try to match *%_isa as well (e.g. "(x86-64)", "(x86-32)")
|
||
|
|
base_or_libs_re = re.compile(
|
||
|
|
- '^(lib)?%s(-libs)?[\d_]*(\(\w+-\d+\))?' % re.escape(base))
|
||
|
|
+ '^(lib)?%s(-libs)?[\d_]*(\(\w+-\d+\))?$' % re.escape(base))
|
||
|
|
for d in deps:
|
||
|
|
if base_or_libs_re.match(d[0]):
|
||
|
|
dep = d
|