particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

runroot: use --chroot instead of chroot mock command

Browse source 
Former is no officially supported anymore

Fixes: https://pagure.io/koji/issue/3133
This commit is contained in:
Tomas Kopecek 2021-11-16 14:26:47 +01:00
parent 098a21fab1
commit 5f9fbf660e
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/builder/runroot.py
View file

@ -210,7 +210,7 @@ class RunRootTask(koji.tasks.BaseTaskHandler):
self.do_mounts(rootdir,
[self._get_path_params(x) for x in self.config['default_mounts']])
self.do_extra_mounts(rootdir, mounts)
mock_cmd = ['chroot']
mock_cmd = []
if new_chroot:
mock_cmd.append('--new-chroot')
elif new_chroot is False: # None -> no option added
@ -220,7 +220,7 @@ class RunRootTask(koji.tasks.BaseTaskHandler):
# chroot one
myarch = platform.uname()[5]
mock_cmd.extend(['--arch', myarch])
mock_cmd.append('--')
mock_cmd.extend(['--chroot', '--'])
mock_cmd.extend(cmdargs)
rv = broot.mock(mock_cmd)
log_paths = ['builddir/runroot.log']