From 5835bb72b4a4e1917af9d09b026ca2bfefd2bf5c Mon Sep 17 00:00:00 2001 From: Adrian Perez Date: Wed, 2 May 2012 21:29:40 +0300 Subject: [PATCH] ostbuild: Make --shell-on-failure flag to work Fixes an issue which would cause ostbuild to fail to spawn the debug shell and print a traceback instead. --- src/ostbuild/pyostbuild/builtin_build_components.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ostbuild/pyostbuild/builtin_build_components.py b/src/ostbuild/pyostbuild/builtin_build_components.py index 5983dea0..11f45d4b 100755 --- a/src/ostbuild/pyostbuild/builtin_build_components.py +++ b/src/ostbuild/pyostbuild/builtin_build_components.py @@ -54,10 +54,10 @@ class OstbuildBuildComponents(builtins.Builtin): '--snapshot=' + self.snapshot_path]) return args - def _launch_debug_shell(self, architecture, buildroot, cwd=None): + def _launch_debug_shell(self, architecture, component, cwd=None): args = self._get_ostbuild_chroot_args(architecture) - args.extend(['--buildroot=' + buildroot, - '--workdir=' + self.workdir, + args.extend(['--arch=' + architecture, + '--name=' + component, '--debug-shell']) run_sync(args, cwd=cwd, fatal_on_error=False, keep_stdin=True) fatal("Exiting after debug shell") @@ -137,7 +137,7 @@ class OstbuildBuildComponents(builtins.Builtin): if self.buildopts.shell_on_failure: ecode = run_sync_monitor_log_file(chroot_args, log_path, cwd=component_src, fatal_on_error=False) if ecode != 0: - self._launch_debug_shell(architecture, buildroot_name, cwd=component_src) + self._launch_debug_shell(architecture, basename, cwd=component_src) else: run_sync_monitor_log_file(chroot_args, log_path, cwd=component_src)