Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sysversion/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def get_turnkey_version(
try:
with open(os.path.join(rootfs, fpath)) as fob:
return fob.read().strip()
except OSError:
except (OSError, ValueError):
pass
return None

Expand Down
22 changes: 16 additions & 6 deletions turnkey-version
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,19 @@ script to show basic system info.
import argparse
import json
import os
import sys
from os.path import isfile, join
from typing import NoReturn

import sysversion

_ROOTFS = "/"
_TKL_VER = "etc/turnkey_version"
TurnkeyVersionError = sysversion.TurnkeyVersionError


def fatal(msg: str) -> NoReturn:
print(f"Error: {msg}", file=sys.stderr)
sys.exit(1)


def main() -> None:
Expand Down Expand Up @@ -127,6 +134,7 @@ def main() -> None:
if args.json and (args.all or output_values):
parser.error("-j|--json conflicts with other output values.")
if args.string:
file = ""
turnkey_version = args.string
rootfs = ""
else:
Expand All @@ -137,13 +145,15 @@ def main() -> None:
else:
rootfs = args.rootfs
v_file = _TKL_VER

file = join(rootfs, v_file)
turnkey_version = sysversion.get_turnkey_version(rootfs, v_file)
if not turnkey_version:
raise TurnkeyVersionError(
"can't detect turnkey version - missing or invalid file"
f"'{os.path.join(rootfs, v_file)}'.",
)
msg = "can't detect turnkey version"
if file and not isfile(file):
msg = f"{msg} - missing/invalid file: '{file}'"
else:
msg = f"{msg} - invalid version string"
fatal(msg)

tkl_appver = []
tkl_appver_cls = sysversion.AppVer(turnkey_version, rootfs=rootfs)
Expand Down
Loading