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:
authorAnton Hvornum <anton@hvornum.se>2022-02-02 14:22:52 +0100
committerGitHub <noreply@github.com>2022-02-02 14:22:52 +0100
commitc08520f9902aeb1b4ce22e1159060792081b0327 (patch)
tree934ac279ac0e6d675b409d7936c97ce73d721a6a /examples/guided.py
parentdfd064a57f6a0006e9fc614ea229fd9883722085 (diff)
SysCommand() to remove ANSII VT100 Esc codes & archlinux-keyring fix (#933)
* Fixed SysCommandWorker() so that it removes ANSII VT100 escape codes. I also moved package.py into it's own folder, as that's something I want to expand on a lot, so package related stuff should go in there. I created a installed_package() function which gets information about the locally installed package. I changed so that find_packages() and find_package() returns a data-model instead for the package information. This should unify and make sure we detect issues down the line. * Working on structuring .version constructor that works with BaseModel * Added version contructors to VersionDef(). Also added __eq__ and __lt__ to LocalPackage() and PackageSearchResult(). * removed debug and added a TODO * Removed whitespace * Removed mirror-database function from myrepo
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'):