index : archinstall32 | |
Archlinux32 installer | gitolite user |
summaryrefslogtreecommitdiff |
author | Anton Hvornum <anton@hvornum.se> | 2022-02-02 14:22:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-02 14:22:52 +0100 |
commit | c08520f9902aeb1b4ce22e1159060792081b0327 (patch) | |
tree | 934ac279ac0e6d675b409d7936c97ce73d721a6a /examples | |
parent | dfd064a57f6a0006e9fc614ea229fd9883722085 (diff) |
-rw-r--r-- | examples/guided.py | 15 |
diff --git a/examples/guided.py b/examples/guided.py index 22e0f883..45e213df 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -309,10 +309,17 @@ if not (archinstall.check_mirror_reachable() or archinstall.arguments.get('skip- archinstall.log(f"Arch Linux mirrors are not reachable. Please check your internet connection and the log file '{log_file}'.", level=logging.INFO, fg="red") exit(1) -if not (archinstall.update_keyring() or archinstall.arguments.get('skip-keyring-update', False)): - log_file = os.path.join(archinstall.storage.get('LOG_PATH', None), archinstall.storage.get('LOG_FILE', None)) - archinstall.log(f"Failed to update the keyring. Please check your internet connection and the log file '{log_file}'.", level=logging.INFO, fg="red") - exit(1) +if not archinstall.arguments.get('offline', False): + # If we want to check for keyring updates + # and the installed package version is lower than the upstream version + if archinstall.arguments.get('skip-keyring-update', False) is False and \ + archinstall.installed_package('archlinux-keyring') < archinstall.find_package('archlinux-keyring'): + + # Then we update the keyring in the ISO environment + if not archinstall.update_keyring(): + log_file = os.path.join(archinstall.storage.get('LOG_PATH', None), archinstall.storage.get('LOG_FILE', None)) + archinstall.log(f"Failed to update the keyring. Please check your internet connection and the log file '{log_file}'.", level=logging.INFO, fg="red") + exit(1) load_config() if not archinstall.arguments.get('silent'): |