janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-21 13:47:39 +01:00
Code Activity

projects.py: Make OS-cascade support distro version families

Browse source 
Now ubuntu-14.04 is also caught by ubuntu-14

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-03-06 16:35:16 +00:00
commit 6ec57849c3
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scripts/projects.py
View file

@ -99,10 +99,23 @@ def htdocs_dir(name):
return None return None
def os_cascade(): def os_cascade():
r = [ 'os', platform.system().lower() ]
os = cache.run(get_os, []) os = cache.run(get_os, [])
name = re.sub('-.*', '', os) name = re.sub('-.*', '', os)
series = os
while True:
n = re.sub('\.[0-9]+$', '', series)
if n == series:
break
r.append(n)
series = n
if not name in r:
r.append(name)
if not os in r:
r.append(os)
# e.g. os, linux, suse, suse-tumbleweed # e.g. os, linux, suse, suse-tumbleweed
return [ 'os', platform.system().lower(), name, os ] #return [ 'os', platform.system().lower(), name, os ]
return r
def strip_module_from_spec(mod): def strip_module_from_spec(mod):
return re.sub(r'-devel$|-run$', '', re.split('([=><]+)', mod)[0].strip()) return re.sub(r'-devel$|-run$', '', re.split('([=><]+)', mod)[0].strip())
@ -625,7 +638,7 @@ debug("----------------------------------------- running ", ' '.join(sys.argv))
projs_root = args.prefix projs_root = args.prefix
if args.topdir: if args.topdir:
topdir = args.topdir topdir = args.topdir
top_name = cache.run(read_value, [topdir + '/make/project.conf', 'build', 'name']) top_name = res_cache.run(read_value, [topdir + '/make/project.conf', 'build', 'name'])
if not top_name: if not top_name:
top_name = re.sub('-[0-9.-]*$', '', basename(realpath(topdir))) top_name = re.sub('-[0-9.-]*$', '', basename(realpath(topdir)))