mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 06:46:15 +01:00
Code

Disable preinstall images in rootless builds

Browse Source
This commit is contained in:
Daniel Mach 2023-11-02 16:06:55 +01:00
parent 7781367b1e
commit 3d20497ce9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osc/build.py
View File

@ -627,10 +627,12 @@ def calculate_build_root(apihost, prj, pac, repo, arch, user=None):
return buildroot
def build_as_user():
if conf.config["su-wrapper"]:
return False
return True
def build_as_user(vm_type=None):
if not conf.config.su_wrapper:
return True
if calculate_build_root_user(vm_type):
return True
return False
def su_wrapper(cmd):
@ -1127,8 +1129,8 @@ def main(apiurl, store, opts, argv):
imagefile = ''
imagesource = ''
imagebins = []
if build_as_user():
# preinstallimage extraction will fail
if build_as_user(vm_type):
# preinstallimage extraction will fail because unprivileged user cannot chroot or extract devices from the tarball
bi.preinstallimage = None
if build_type == 'preinstallimage':
# preinstallimage would repackage just the previously built preinstallimage