1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 15:47:45 +00:00

Meta+Ports: Make 'package.sh showproperty' report multiple properties

And use that to avoid shelling out multiple times for checking
properties in lint-ports.py.
This commit is contained in:
Ali Mohammad Pur 2022-01-17 13:19:23 +03:30 committed by Andreas Kling
parent 7a26f6523a
commit 63b02859bc
2 changed files with 27 additions and 22 deletions

View file

@ -197,16 +197,17 @@ def get_port_properties(port):
"""
props = {}
for prop in PORT_PROPERTIES:
res = subprocess.run(f"cd {port}; exec ./package.sh showproperty {prop}", shell=True, capture_output=True)
if res.returncode == 0:
props[prop] = res.stdout.decode('utf-8').strip()
else:
print((
f'Executing "./package.sh showproperty {prop}" script for port {port} failed with '
f'exit code {res.returncode}, output from stderr:\n{res.stderr.decode("utf-8").strip()}'
))
props[prop] = ''
package_sh_command = f"./package.sh showproperty {' '.join(PORT_PROPERTIES)}"
res = subprocess.run(f"cd {port}; exec {package_sh_command}", shell=True, capture_output=True)
if res.returncode == 0:
results = res.stdout.decode('utf-8').split('\n\n')
props = {prop: results[i].strip() for i, prop in enumerate(PORT_PROPERTIES)}
else:
print((
f'Executing "{package_sh_command}" script for port {port} failed with '
f'exit code {res.returncode}, output from stderr:\n{res.stderr.decode("utf-8").strip()}'
))
props = {x: '' for x in PORT_PROPERTIES}
return props