Compare commits
No commits in common. "85655dbc1d433663f7aa70313c72f54d23ad83d6" and "f30a4fe75ad940bdfbb3f2f1577ce0e1bdce6a96" have entirely different histories.
85655dbc1d
...
f30a4fe75a
2 changed files with 3 additions and 18 deletions
|
@ -132,9 +132,7 @@ following:
|
|||
|
||||
[MyAURRepo]
|
||||
SigLevel = Required TrustedOnly
|
||||
Server = file:///home/MyAURRepoDirectory
|
||||
# Optionally set a file with `Server = ...` entries
|
||||
# Include = /etc/pacman.d/my_repo_server_list
|
||||
Include = file:///home/MyAURRepoDirectory
|
||||
|
||||
Note that `SigLevel` is set expecting the `MyAURRepo.db` file to be signed (the
|
||||
Python script usually signs the `.db` file after a package has been successfully
|
||||
|
|
17
update.py
17
update.py
|
@ -1598,7 +1598,7 @@ def print_state_info_and_get_update_list(
|
|||
for pkg_name, pkg_dict in pkg_state.items():
|
||||
if "state" in pkg_dict:
|
||||
log_print(
|
||||
f" {pkg_name:40}: pre_state is \"{pkg_dict['state']}\", build_state is \"{pkg_dict['build_status']}\"",
|
||||
f" {pkg_name:40}: {pkg_dict['state']}",
|
||||
other_state=other_state,
|
||||
)
|
||||
if pkg_dict["state"] == "install":
|
||||
|
@ -2008,9 +2008,6 @@ if __name__ == "__main__":
|
|||
sys.exit(1)
|
||||
|
||||
pkg_list = [temp_pkg_name for temp_pkg_name in pkg_state.keys()]
|
||||
# ensure build_status is populated.
|
||||
for pkg_name in pkg_list:
|
||||
pkg_state[pkg_name]["build_status"] = "unknown"
|
||||
i = 0
|
||||
furthest_checked = 0
|
||||
going_back = False
|
||||
|
@ -2053,8 +2050,7 @@ if __name__ == "__main__":
|
|||
f"Pkg {pkg_list[i]} is up to date, skipping...",
|
||||
other_state=other_state,
|
||||
)
|
||||
pkg_state[pkg_list[i]]["state"] = "up_to_date"
|
||||
pkg_state[pkg_list[i]]["build_status"] = "not_building"
|
||||
pkg_state[pkg_list[i]]["state"] = "up to date"
|
||||
i += 1
|
||||
continue
|
||||
check_pkg_build_result = check_pkg_build(
|
||||
|
@ -2064,12 +2060,10 @@ if __name__ == "__main__":
|
|||
pass
|
||||
elif check_pkg_build_result == "not_ok":
|
||||
pkg_state[pkg_list[i]]["state"] = "skip"
|
||||
pkg_state[pkg_list[i]]["build_status"] = "not_building"
|
||||
i += 1
|
||||
continue
|
||||
elif check_pkg_build_result == "force_build":
|
||||
pkg_state[pkg_list[i]]["state"] = "install"
|
||||
pkg_state[pkg_list[i]]["build_status"] = "will_build"
|
||||
i += 1
|
||||
continue
|
||||
elif check_pkg_build_result == "invalid":
|
||||
|
@ -2099,22 +2093,15 @@ if __name__ == "__main__":
|
|||
confirm_result_result = confirm_result(pkg_list[i], state_result)
|
||||
if confirm_result_result == "continue":
|
||||
pkg_state[pkg_list[i]]["state"] = state_result
|
||||
pkg_state[pkg_list[i]]["build_status"] = (
|
||||
"will_build"
|
||||
if state_result == "install"
|
||||
else "not_building"
|
||||
)
|
||||
break
|
||||
elif confirm_result_result == "recheck":
|
||||
check_pkg_version_result = None
|
||||
continue
|
||||
elif confirm_result_result == "force_build":
|
||||
pkg_state[pkg_list[i]]["state"] = "install"
|
||||
pkg_state[pkg_list[i]]["build_status"] = "will_build"
|
||||
break
|
||||
elif confirm_result_result == "skip":
|
||||
pkg_state[pkg_list[i]]["state"] = "skip"
|
||||
pkg_state[pkg_list[i]]["build_status"] = "not_building"
|
||||
break
|
||||
elif confirm_result_result == "back":
|
||||
if i > 0:
|
||||
|
|
Loading…
Reference in a new issue