From 8d022beb8a9ae7c25a2f49990605888d9fa61e76 Mon Sep 17 00:00:00 2001 From: Stephen Seo Date: Sat, 4 Jun 2022 16:15:41 +0900 Subject: [PATCH] Fixes to README.md and update.py --- README.md | 2 +- update.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6ba4063..00a82e9 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ script to run. Use `/usr/bin/mkarchroot` to create your CHROOT in a directory. - mkarchroot $HOME/mychroot base base-devel ccache sccache + mkarchroot $HOME/mychroot/root base base-devel ccache sccache You must refer to the CHROOT as `$HOME/mychroot` if you used the same name as in the previous example. diff --git a/update.py b/update.py index dfe7f13..55f37a5 100755 --- a/update.py +++ b/update.py @@ -1012,6 +1012,7 @@ if __name__ == "__main__": pkg_state = {} other_state = {} + other_state['logs_dir'] = None if args.pkg and not args.config: for pkg in args.pkg: pkg_state[pkg] = {} @@ -1082,8 +1083,8 @@ if __name__ == "__main__": other_state['gpg_home'] = d["gpg_dir"] other_state['logs_dir'] = d["logs_dir"] other_state['clones_dir'] = d["clones_dir"] - if args_logs_dir is not None: - GLOBAL_LOG_FILE = args_logs_dir + "/update.py_logs" + if other_state['logs_dir'] is not None: + GLOBAL_LOG_FILE = other_state['logs_dir'] + "/update.py_logs" log_print( f"{datetime.datetime.now(datetime.timezone.utc).strftime('%Y-%m-%d %H:%M %Z')}" ) @@ -1160,7 +1161,7 @@ if __name__ == "__main__": sys.exit(1) if skip_on_same_ver: check_pkg_version_result = check_pkg_version( - pkg_list[i], pkg_state, args_repo, True, other_state + pkg_list[i], pkg_state, other_state['repo'], True, other_state ) if check_pkg_version_result != "install": log_print(f"Pkg {pkg_list[i]} is up to date, skipping...") @@ -1192,7 +1193,7 @@ if __name__ == "__main__": state_result = check_pkg_version_result else: state_result = check_pkg_version( - pkg_list[i], pkg_state, args_repo, False, other_state + pkg_list[i], pkg_state, other_state['repo'], False, other_state ) confirm_result_result = confirm_result(pkg_list[i], state_result) if confirm_result_result == "continue":