jmm/kiwi-scp
2
0
Fork 0
Code Projects Wiki Activity

Format

Browse source
This commit is contained in:
Jörn-Michael Miehe 2020-08-24 14:48:50 +02:00
parent 4407899fbb
commit 9c198622ca
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kiwi
View file

@ -72,7 +72,7 @@ done
if [ -f "./${KIWI_CONF_NAME}" ]; then if [ -f "./${KIWI_CONF_NAME}" ]; then
# determine needed kiwi-config version # determine needed kiwi-config version
re_version_line='version\s*:\s*' 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 fi
# install if kiwi-config not found # install if kiwi-config not found

3
src/kiwi/runner.py
View file

@ -24,7 +24,8 @@ class Runner:
], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) ], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
except subprocess.CalledProcessError: 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 # setup all subcommands
for className in subcommands.__all__: for className in subcommands.__all__: