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

Update chroot before checking pkgs not after

Browse source
This commit is contained in:
Stephen Seo 2022-07-20 11:32:26 +09:00
parent 7fda71cdf2
commit 37b51e028b
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
update.py
View file

@ -679,7 +679,6 @@ def update_pkg_list(
pkgs, pkgs,
pkg_state, pkg_state,
other_state, other_state,
no_update,
signing_gpg_dir, signing_gpg_dir,
signing_gpg_key_fp, signing_gpg_key_fp,
signing_gpg_pass, signing_gpg_pass,
@ -688,21 +687,6 @@ def update_pkg_list(
if not get_sudo_privileges(): if not get_sudo_privileges():
log_print("ERROR: Failed to get sudo privileges") log_print("ERROR: Failed to get sudo privileges")
sys.exit(1) sys.exit(1)
if not no_update:
log_print("Updating the chroot...")
try:
subprocess.run(
[
"arch-nspawn",
"{}/root".format(other_state["chroot"]),
"pacman",
"-Syu",
],
check=True,
)
except subprocess.CalledProcessError:
log_print("ERROR: Failed to update the chroot")
sys.exit(1)
for pkg in pkgs: for pkg in pkgs:
pkgdir = os.path.join(other_state["clones_dir"], pkg) pkgdir = os.path.join(other_state["clones_dir"], pkg)
log_print(f'Building "{pkg}"...') log_print(f'Building "{pkg}"...')
@ -1221,6 +1205,23 @@ if __name__ == "__main__":
) )
) )
sys.exit(1) sys.exit(1)
if not args.no_update:
log_print("Updating the chroot...")
try:
subprocess.run(
[
"arch-nspawn",
"{}/root".format(other_state["chroot"]),
"pacman",
"-Syu",
],
check=True,
)
except subprocess.CalledProcessError:
log_print("ERROR: Failed to update the chroot")
sys.exit(1)
pkg_list = [temp_pkg_name for temp_pkg_name in pkg_state.keys()] pkg_list = [temp_pkg_name for temp_pkg_name in pkg_state.keys()]
i = 0 i = 0
furthest_checked = 0 furthest_checked = 0
@ -1337,7 +1338,6 @@ if __name__ == "__main__":
pkgs_to_update, pkgs_to_update,
pkg_state, pkg_state,
other_state, other_state,
args.no_update,
"" if args.no_store else other_state["signing_gpg_dir"], "" if args.no_store else other_state["signing_gpg_dir"],
"" if args.no_store else other_state["signing_gpg_key_fp"], "" if args.no_store else other_state["signing_gpg_key_fp"],
"" if args.no_store else other_state["signing_gpg_pass"], "" if args.no_store else other_state["signing_gpg_pass"],