diff --git a/chroot.py b/chroot.py index f4ecd42..f90a016 100644 --- a/chroot.py +++ b/chroot.py @@ -65,7 +65,8 @@ def create_chroot( ], capture_output=True) if result.returncode != 0: - raise Exception('Failed to install chroot:' + result.stdout.decode() + '\n' + result.stderr.decode()) + logging.debug(result.stdout.decode()) + raise Exception(f'Failed to install chroot "{chroot_name}":' + '\n' + result.stderr.decode()) return chroot_path diff --git a/image.py b/image.py index 9e27913..d9ba8b0 100644 --- a/image.py +++ b/image.py @@ -134,7 +134,7 @@ def cmd_build(): packages_dir = config.file['paths']['packages'] if os.path.exists(packages_dir): - url = f'file://{packages_dir}/$repo', + url = f'file://{packages_dir}/$repo' else: url = 'https://gitlab.com/kupfer/packages/prebuilts/-/raw/main/$repo' extra_repos = {repo: {'Server': url} for repo in REPOSITORIES} diff --git a/main.py b/main.py index b0f2bc0..d2d2119 100644 --- a/main.py +++ b/main.py @@ -6,10 +6,11 @@ from flash import cmd_flash from ssh import cmd_ssh from forwarding import cmd_forwarding from telnet import cmd_telnet -from logger import logging, setup_logging, verbose_option, get_trace +from logger import logging, setup_logging, verbose_option import click from config import config, config_option from wrapper import enforce_wrap, nowrapper_option +from traceback import format_exc as get_trace @click.group() @@ -28,8 +29,7 @@ def main(): try: return cli(prog_name='kupferbootstrap') except Exception as err: - logging.debug(get_trace()) - logging.fatal(err) + logging.fatal(get_trace()) exit(1)