packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ostbuild: Fix --debug-shell option

This commit is contained in:
Colin Walters 2012-05-23 18:02:08 -04:00
parent 893774aab5
commit 6c006815ce
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ostbuild/pyostbuild/builtin_build.py
View File

@ -44,21 +44,22 @@ class OstbuildBuild(builtins.Builtin):
def __init__(self): def __init__(self):
builtins.Builtin.__init__(self) builtins.Builtin.__init__(self)
def _get_ostbuild_chroot_args(self, architecture): def _get_ostbuild_chroot_args(self, architecture, component, component_resultdir):
basename = component['name']
current_machine = os.uname()[4] current_machine = os.uname()[4]
if current_machine != architecture: if current_machine != architecture:
args = ['setarch', architecture] args = ['setarch', architecture]
else: else:
args = [] args = []
args.extend(['ostbuild', 'chroot-compile-one', args.extend(['ostbuild', 'chroot-compile-one',
'--snapshot=' + self.snapshot_path]) '--snapshot=' + self.snapshot_path,
'--name=' + basename, '--arch=' + architecture,
'--resultdir=' + component_resultdir])
return args return args
def _launch_debug_shell(self, architecture, component, cwd=None): def _launch_debug_shell(self, architecture, component, component_resultdir, cwd=None):
args = self._get_ostbuild_chroot_args(architecture) args = self._get_ostbuild_chroot_args(architecture, component, component_resultdir)
args.extend(['--arch=' + architecture, args.append('--debug-shell')
'--name=' + component,
'--debug-shell'])
run_sync(args, cwd=cwd, fatal_on_error=False, keep_stdin=True) run_sync(args, cwd=cwd, fatal_on_error=False, keep_stdin=True)
fatal("Exiting after debug shell") fatal("Exiting after debug shell")
@ -147,13 +148,11 @@ class OstbuildBuild(builtins.Builtin):
log("Logging to %s" % (log_path, )) log("Logging to %s" % (log_path, ))
f = open(log_path, 'w') f = open(log_path, 'w')
chroot_args = self._get_ostbuild_chroot_args(architecture) chroot_args = self._get_ostbuild_chroot_args(architecture, component, component_resultdir)
chroot_args.extend(['--name=' + basename, '--arch=' + architecture,
'--resultdir=' + component_resultdir])
if self.buildopts.shell_on_failure: if self.buildopts.shell_on_failure:
ecode = run_sync_monitor_log_file(chroot_args, log_path, cwd=component_src, fatal_on_error=False) ecode = run_sync_monitor_log_file(chroot_args, log_path, cwd=component_src, fatal_on_error=False)
if ecode != 0: if ecode != 0:
self._launch_debug_shell(architecture, basename, cwd=component_src) self._launch_debug_shell(architecture, component, component_resultdir, cwd=component_src)
else: else:
run_sync_monitor_log_file(chroot_args, log_path, cwd=component_src) run_sync_monitor_log_file(chroot_args, log_path, cwd=component_src)