From 9c198622ca5480ee47b8d114db1258f76692fb7c Mon Sep 17 00:00:00 2001 From: ldericher Date: Mon, 24 Aug 2020 14:48:50 +0200 Subject: [PATCH] Format --- kiwi | 2 +- src/kiwi/runner.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kiwi b/kiwi index 6f09e4a..71f2382 100755 --- a/kiwi +++ b/kiwi @@ -72,7 +72,7 @@ done if [ -f "./${KIWI_CONF_NAME}" ]; then # determine needed kiwi-config version re_version_line='version\s*:\s*' - eval "$(grep -E "${re_version_line}" "./${KIWI_CONF_NAME}" | sed -r 's/'"${re_version_line}"'/KIWI_VERSION=/')" + eval "$(grep -E "${re_version_line}" "./${KIWI_CONF_NAME}" | sed -r "s/${re_version_line}/KIWI_VERSION=/")" fi # install if kiwi-config not found diff --git a/src/kiwi/runner.py b/src/kiwi/runner.py index affa16e..a2b33dd 100644 --- a/src/kiwi/runner.py +++ b/src/kiwi/runner.py @@ -24,7 +24,8 @@ class Runner: ], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) except subprocess.CalledProcessError: - raise PermissionError("Cannot access docker, please get into the docker group or run as root!") + logging.critical("Cannot access docker, please get into the docker group or run as root!") + quit(1) # setup all subcommands for className in subcommands.__all__: