mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-09 04:25:48 +01:00
Code

Merge pull request #1444 from dmach/disable-preinstallimage-in-rootless-builds

Browse Source 
Disable preinstall images in rootless builds
This commit is contained in:
Daniel Mach 2023-11-03 09:19:42 +01:00 committed by GitHub
commit 503cf10a84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 return buildroot
def build_as_user(): def build_as_user(vm_type=None):
if conf.config["su-wrapper"]: if not conf.config.su_wrapper:
return False return True
return True if calculate_build_root_user(vm_type):
return True
return False
def su_wrapper(cmd): def su_wrapper(cmd):
@ -1127,8 +1129,8 @@ def main(apiurl, store, opts, argv):
imagefile = '' imagefile = ''
imagesource = '' imagesource = ''
imagebins = [] imagebins = []
if build_as_user(): if build_as_user(vm_type):
# preinstallimage extraction will fail # preinstallimage extraction will fail because unprivileged user cannot chroot or extract devices from the tarball
bi.preinstallimage = None bi.preinstallimage = None
if build_type == 'preinstallimage': if build_type == 'preinstallimage':
# preinstallimage would repackage just the previously built preinstallimage # preinstallimage would repackage just the previously built preinstallimage