parchlinux-mobile/kupferbootstrap
1
0
Fork 1
mirror of https://gitlab.com/kupfer/kupferbootstrap.git synced 2025-02-23 05:35:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

packages/build: setup_sources(): drop --holdver

Browse source 
Dubious gain with gratis issues
This commit is contained in:
InsanePrawn 2022-12-09 05:43:36 +01:00
parent 795878cfeb
commit 6fa717ce64
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/build.py
View file

@ -460,13 +460,12 @@ def setup_sources(package: Pkgbuild, lazy: bool = True):
if cache.validate_checksums(): if cache.validate_checksums():
logging.info(f"{package.path}: Sources already set up.") logging.info(f"{package.path}: Sources already set up.")
return return
makepkg_setup = ' '.join(MAKEPKG_CMD + [ makepkg_setup = MAKEPKG_CMD + [
'--nodeps', '--nodeps',
'--nobuild', '--nobuild',
'--noprepare', '--noprepare',
'--skippgpcheck', '--skippgpcheck',
]) ]
msg = "makepkg sources setup failed; retrying without --holdver"
logging.info(f'{package.path}: Getting build chroot for source setup') logging.info(f'{package.path}: Getting build chroot for source setup')
# we need to use a chroot here because makepkg symlinks sources into src/ via an absolute path # we need to use a chroot here because makepkg symlinks sources into src/ via an absolute path
@ -474,11 +473,7 @@ def setup_sources(package: Pkgbuild, lazy: bool = True):
assert config.runtime.arch assert config.runtime.arch
chroot = setup_build_chroot(config.runtime.arch) chroot = setup_build_chroot(config.runtime.arch)
logging.info(f'{package.path}: Setting up sources with makepkg') logging.info(f'{package.path}: Setting up sources with makepkg')
result = chroot.run_cmd( result = chroot.run_cmd(makepkg_setup, cwd=dir, switch_user='kupfer')
f"{makepkg_setup} --holdver || ( echo '{package.path}: {msg}' ; {makepkg_setup} )",
cwd=dir,
switch_user='kupfer',
)
assert isinstance(result, subprocess.CompletedProcess) assert isinstance(result, subprocess.CompletedProcess)
if result.returncode != 0: if result.returncode != 0:
raise Exception(f'{package.path}: Failed to setup sources, exit code: {result.returncode}') raise Exception(f'{package.path}: Failed to setup sources, exit code: {result.returncode}')