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

Instead of sys.exit(1), fail gracefully some cases

Browse source
This commit is contained in:
Stephen Seo 2023-10-03 10:51:43 +09:00
parent 5fe4a0e864
commit d11af2fd99
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
update.py
View file

@ -709,7 +709,7 @@ def get_pkgbuild_version(
'ERROR: Failed to get dep "{}"'.format(dep), 'ERROR: Failed to get dep "{}"'.format(dep),
other_state=other_state, other_state=other_state,
) )
sys.exit(1) return False, None, None, None
command_list.insert(2, "-I") command_list.insert(2, "-I")
command_list.insert(3, dep_fullpath) command_list.insert(3, dep_fullpath)
for aur_dep in pkg_state[pkg]["aur_deps"]: for aur_dep in pkg_state[pkg]["aur_deps"]:
@ -721,7 +721,7 @@ def get_pkgbuild_version(
'ERROR: Failed to get aur_dep "{}"'.format(aur_dep), 'ERROR: Failed to get aur_dep "{}"'.format(aur_dep),
other_state=other_state, other_state=other_state,
) )
sys.exit(1) return False, None, None, None
command_list.insert(2, "-I") command_list.insert(2, "-I")
command_list.insert(3, aur_dep_fullpath) command_list.insert(3, aur_dep_fullpath)
subprocess.run( subprocess.run(
@ -1245,6 +1245,7 @@ def update_pkg_list(
"--log", "--log",
"--holdver", "--holdver",
] ]
failure = False
for dep in pkg_state[pkg]["other_deps"]: 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:
@ -1252,9 +1253,12 @@ def update_pkg_list(
'ERROR: Failed to get dep "{}"'.format(dep), 'ERROR: Failed to get dep "{}"'.format(dep),
other_state=other_state, other_state=other_state,
) )
sys.exit(1) failure = True
break
command_list.insert(2, "-I") command_list.insert(2, "-I")
command_list.insert(3, dep_fullpath) command_list.insert(3, dep_fullpath)
if failure:
continue
for aur_dep in pkg_state[pkg]["aur_deps"]: for aur_dep in pkg_state[pkg]["aur_deps"]:
aur_dep_fullpath = get_latest_pkg( aur_dep_fullpath = get_latest_pkg(
aur_dep, other_state["pkg_out_dir"] aur_dep, other_state["pkg_out_dir"]
@ -1264,9 +1268,12 @@ def update_pkg_list(
'ERROR: Failed to get aur_dep "{}"'.format(aur_dep), 'ERROR: Failed to get aur_dep "{}"'.format(aur_dep),
other_state=other_state, other_state=other_state,
) )
sys.exit(1) failure = True
break
command_list.insert(2, "-I") command_list.insert(2, "-I")
command_list.insert(3, aur_dep_fullpath) command_list.insert(3, aur_dep_fullpath)
if failure:
continue
if "ccache_dir" in pkg_state[pkg]: if "ccache_dir" in pkg_state[pkg]:
command_list.insert(2, "-d") command_list.insert(2, "-d")
command_list.insert(3, f'{pkg_state[pkg]["ccache_dir"]}:/ccache') command_list.insert(3, f'{pkg_state[pkg]["ccache_dir"]}:/ccache')