From 8f196287af791670c819b6e34b509b4f4e4c38be Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 24 Oct 2018 11:00:22 +0000 Subject: [PATCH] projects.py: Fix bogus interpretation of os dep package version requires.os.run = java-headless = 1.8.0 led to an attempt to look up ../java-headless/VERSION Signed-off-by: Jan Lindemann --- scripts/projects.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/projects.py b/scripts/projects.py index 9240d99e..c1d113d5 100644 --- a/scripts/projects.py +++ b/scripts/projects.py @@ -504,10 +504,10 @@ def pkg_relations(rel_type, args_): dep = dep[:1] dep = map(str.strip, dep) if args.no_subpackages: - dep[0] = re.sub('-devel$|-run$', '', dep[0]) + dep[0] = re.sub('-dev$|-devel$|-run$', '', dep[0]) for i, item in enumerate(dep): dep[i] = item.strip() - if len(dep) == 3: + if s == 'jw' and len(dep) == 3: dep_project = re.sub(r'-devel$|-run$', '', dep[0]) if args.dont_expand_version_macros and dep_project in args.module: version = dep[2]