Cloned2Preserve
/
jailmaker
mirror of https://github.com/Jip-Hop/jailmaker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix list fallback value

This commit is contained in:
Jip-Hop 2024-03-02 18:20:25 +01:00
parent ac75cd3c28
commit 9e160c8a52
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jlmkr.py
View File

@ -1502,7 +1502,10 @@ def print_table(header, list_of_objects, empty_value_indicator):
widths = defaultdict(int) widths = defaultdict(int)
for obj in list_of_objects: for obj in list_of_objects:
for hdr in header: for hdr in header:
widths[hdr] = max(widths[hdr], len(str(obj.get(hdr))), len(str(hdr))) value = obj.get(hdr)
if value is None:
obj[hdr] = value = empty_value_indicator
widths[hdr] = max(widths[hdr], len(str(value)), len(str(hdr)))
# Print header # Print header
print( print(
@ -1511,12 +1514,7 @@ def print_table(header, list_of_objects, empty_value_indicator):
# Print rows # Print rows
for obj in list_of_objects: for obj in list_of_objects:
print( print(" ".join(str(obj.get(hdr)).ljust(widths[hdr]) for hdr in header))
" ".join(
str(obj.get(hdr, empty_value_indicator)).ljust(widths[hdr])
for hdr in header
)
)
def run_command_and_parse_json(command): def run_command_and_parse_json(command):
@ -1544,6 +1542,7 @@ def parse_os_release(candidates):
for candidate in candidates: for candidate in candidates:
try: try:
with open(candidate, encoding="utf-8") as f: with open(candidate, encoding="utf-8") as f:
# TODO: can I create a solution which not depends on the internal _parse_os_release method?
return platform._parse_os_release(f) return platform._parse_os_release(f)
except OSError: except OSError:
# Silently ignore failing to read os release info # Silently ignore failing to read os release info
@ -1597,8 +1596,8 @@ def list_jails():
machine = running_machines[jail_name] machine = running_machines[jail_name]
# Augment the jails dict with output from machinectl # Augment the jails dict with output from machinectl
jail["running"] = True jail["running"] = True
jail["os"] = machine["os"] jail["os"] = machine["os"] or None
jail["version"] = machine["version"] jail["version"] = machine["version"] or None
addresses = machine.get("addresses") addresses = machine.get("addresses")
if not addresses: if not addresses:
@ -1618,7 +1617,9 @@ def list_jails():
) )
jail["os"] = jail_platform.get("ID") jail["os"] = jail_platform.get("ID")
jail["version"] = jail_platform.get("VERSION_ID") jail["version"] = jail_platform.get("VERSION_ID") or jail_platform.get(
"VERSION_CODENAME"
)
print_table( print_table(
[ [