mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-19 05:13:56 +01:00
projects.py: Fix bogus newline in get_os()
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
0070f788b2
commit
98eda48ec6
1 changed files with 2 additions and 0 deletions
|
|
@ -53,6 +53,7 @@ def get_os(args = ""):
|
||||||
if rr:
|
if rr:
|
||||||
err("failed to run ", cmd)
|
err("failed to run ", cmd)
|
||||||
continue
|
continue
|
||||||
|
out = re.sub('\n', '', out)
|
||||||
return out
|
return out
|
||||||
return "linux"
|
return "linux"
|
||||||
|
|
||||||
|
|
@ -265,6 +266,7 @@ def cmd_required_pkg(args_):
|
||||||
deps = get_modules_from_project_txt(args.module, 'pkg.required.jw', [ 'build' ],
|
deps = get_modules_from_project_txt(args.module, 'pkg.required.jw', [ 'build' ],
|
||||||
scope = 2, add_self=True, names_only=True)
|
scope = 2, add_self=True, names_only=True)
|
||||||
subsecs = pkg_required_os_cascade()
|
subsecs = pkg_required_os_cascade()
|
||||||
|
debug("subsecs = ", subsecs)
|
||||||
required = []
|
required = []
|
||||||
for s in subsecs:
|
for s in subsecs:
|
||||||
vals = collect_values(deps, 'pkg.required.' + s, 'build')
|
vals = collect_values(deps, 'pkg.required.' + s, 'build')
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue