Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/examples/guided.py
diff options
context:
space:
mode:
Diffstat (limited to 'examples/guided.py')
-rw-r--r--examples/guided.py15
1 files changed, 11 insertions, 4 deletions
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'):