janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

projects.py: Fix bogus interpretation of os dep package version

Browse source 
requires.os.run = java-headless = 1.8.0 led to an attempt to
look up ../java-headless/VERSION

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-10-24 11:00:22 +00:00
commit 8f196287af
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/projects.py
View file

@ -504,10 +504,10 @@ def pkg_relations(rel_type, args_):
dep = dep[:1] dep = dep[:1]
dep = map(str.strip, dep) dep = map(str.strip, dep)
if args.no_subpackages: 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): for i, item in enumerate(dep):
dep[i] = item.strip() dep[i] = item.strip()
if len(dep) == 3: if s == 'jw' and len(dep) == 3:
dep_project = re.sub(r'-devel$|-run$', '', dep[0]) dep_project = re.sub(r'-devel$|-run$', '', dep[0])
if args.dont_expand_version_macros and dep_project in args.module: if args.dont_expand_version_macros and dep_project in args.module:
version = dep[2] version = dep[2]