From 871f990c377b94a88f1d51e93412b68cfb70a8c7 Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Mon, 27 Apr 2015 12:19:04 +0300 Subject: backports: fix coccinelle version check Upstream commit 981e0abc8a0b4a7d0327007ef455762efc92bcc0 bpreqs.py assumes the max rc level is 20. However, backports currently requires coccinelle 1.0.0-rc24 (which is the latest rc before 1.0.0). This resulted in 1.0.0-rc24 getting higher weight than 1.0.0, which failed the dependency check. Fix it by increasing the max rc to 25 (and use a constant for it) Signed-off-by: Eliad Peller Signed-off-by: Hauke Mehrtens --- lib/bpreqs.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bpreqs.py b/lib/bpreqs.py index 6c466701..1325fd21 100644 --- a/lib/bpreqs.py +++ b/lib/bpreqs.py @@ -78,6 +78,8 @@ class Req: sys.stdout.write("You are using for version: %s\n" % stdout.split()[version_pos]) sys.stdout.write("Specifically your idx, element: %s\n" % ([[i, x] for i, x in enumerate(stdout.split())][version_pos])) return stdout.split()[version_pos] + + MAX_RC = 25 def __compute_rel_weight(self, rel_specs): weight = 0 extra = 0 @@ -98,7 +100,7 @@ class Req: if (rc == ""): rc = 0 else: - rc = int(rc) - 20 + rc = int(rc) - (Req.MAX_RC + 1) extra = int(rc) else: extra = int(rel_specs['EXTRAVERSION']) + 10 -- cgit v1.2.3