stephenseo/AnotherAURHelper
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes

Browse source 
Change "prefetch_dependency" to "prefetch_dependnecies" and fetch all
"other_deps" at the same time.

Fix some erronous type hints.
This commit is contained in:
Stephen Seo 2024-04-08 11:57:09 +09:00
parent a040785bd6
commit 99f3d915c6
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
update.py
View file

@ -741,14 +741,19 @@ def get_pkgbuild_version(
5, 5,
f'{os.environ["HOME"]}/.cargo/git:/build/.cargo/git', f'{os.environ["HOME"]}/.cargo/git:/build/.cargo/git',
) )
for dep in pkg_state[pkg]["other_deps"]: if len(pkg_state[pkg]["other_deps"]) != 0:
prefetch_result = prefetch_dependency(dep, other_state) prefetch_result = prefetch_dependencies(
pkg_state[pkg]["other_deps"], other_state
)
if prefetch_result != "fetched": if prefetch_result != "fetched":
log_print( log_print(
'ERROR: Failed to prefetch dep "{}"'.format(dep), "ERROR: Failed to prefetch deps {}".format(
pkg_state[pkg]["other_deps"]
),
other_state=other_state, other_state=other_state,
) )
return False, None, None, None return False, None, None, None
for dep in pkg_state[pkg]["other_deps"]:
dep_fullpath = get_latest_pkg(dep, "/var/cache/pacman/pkg") dep_fullpath = get_latest_pkg(dep, "/var/cache/pacman/pkg")
if not dep_fullpath: if not dep_fullpath:
log_print( log_print(
@ -1385,16 +1390,21 @@ def update_pkg_list(
pkg_state[pkg]["other_deps"].append("ccache") pkg_state[pkg]["other_deps"].append("ccache")
elif "sccache_dir" in pkg_state[pkg]: elif "sccache_dir" in pkg_state[pkg]:
pkg_state[pkg]["other_deps"].append("sccache") pkg_state[pkg]["other_deps"].append("sccache")
for dep in pkg_state[pkg]["other_deps"]: if len(pkg_state[pkg]["other_deps"]) != 0:
prefetch_result = prefetch_dependency(dep, other_state) prefetch_result = prefetch_dependencies(
pkg_state[pkg]["other_deps"], other_state
)
if prefetch_result != "fetched": if prefetch_result != "fetched":
log_print( log_print(
'ERROR: Failed to prefetch dep "{}"'.format(dep), "ERROR: Failed to prefetch deps {}".format(
pkg_state[pkg]["other_deps"]
),
other_state=other_state, other_state=other_state,
) )
failure = True failure = True
pkg_state[pkg]["build_status"] = "get_dep_fail" pkg_state[pkg]["build_status"] = "get_dep_fail"
break break
for dep in pkg_state[pkg]["other_deps"]:
dep_fullpath = get_latest_pkg(dep, "/var/cache/pacman/pkg") dep_fullpath = get_latest_pkg(dep, "/var/cache/pacman/pkg")
if not dep_fullpath: if not dep_fullpath:
log_print( log_print(
@ -2007,7 +2017,7 @@ fi
return "ok" return "ok"
def prepare_user_chroot(other_state: [str, Any]): def prepare_user_chroot(other_state: dict[str, Any]):
try: try:
log_print( log_print(
'Running "makechrootpkg ... --nobuild" with dummy package to ensure user chroot is ready...', 'Running "makechrootpkg ... --nobuild" with dummy package to ensure user chroot is ready...',
@ -2050,15 +2060,17 @@ def prepare_user_chroot(other_state: [str, Any]):
return True return True
def prefetch_dependency(pkg_name, other_state: [str, Any]): def prefetch_dependencies(pkg_names: [str], other_state: dict[str, Any]):
"""Returns "fetched" on success.""" """Returns "fetched" on success."""
log_print( log_print(
f'Prefetching package "{pkg_name}" with "pacman -Sw"...', f'Prefetching package "{pkg_name}" with "pacman -Sw"...',
other_state=other_state, other_state=other_state,
) )
command_list = ["/usr/bin/env", "sudo", "pacman", "--noconfirm", "-Sw"]
command_list.extend(pkg_names)
try: try:
subprocess.run( subprocess.run(
("/usr/bin/env", "sudo", "pacman", "--noconfirm", "-Sw", pkg_name), command_list,
check=True, check=True,
) )
except subprocess.CalledProcessError: except subprocess.CalledProcessError: