From 837f89a8a7a85d96ffae713df7ac71c68cf24acc Mon Sep 17 00:00:00 2001 From: Andre Detsch Date: Fri, 28 Jun 2024 15:31:11 -0300 Subject: [PATCH 1/2] Fix typos in a few log messages Signed-off-by: Andre Detsch --- apps/aklite-offline/main.cpp | 2 +- src/composeapp/appengine.cc | 2 +- src/composeappmanager.cc | 4 ++-- src/rootfstreemanager.cc | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/aklite-offline/main.cpp b/apps/aklite-offline/main.cpp index 2d20d544..a30dd205 100644 --- a/apps/aklite-offline/main.cpp +++ b/apps/aklite-offline/main.cpp @@ -37,7 +37,7 @@ int main(int argc, char** argv) { })}; if (cmds.end() == find_it) { - LOG_ERROR << "Unsuported command: " << cmd_name << "\n"; + LOG_ERROR << "Unsupported command: " << cmd_name << "\n"; print_usage(); exit(EXIT_FAILURE); } diff --git a/src/composeapp/appengine.cc b/src/composeapp/appengine.cc index 2bc027f2..2783b110 100644 --- a/src/composeapp/appengine.cc +++ b/src/composeapp/appengine.cc @@ -189,7 +189,7 @@ bool AppEngine::isAppInstalled(const App& app) const { void AppEngine::installAppAndImages(const App& app) { exec(boost::format{"%s --store %s --compose %s --host %s install %s"} % composectl_cmd_ % storeRoot() % installRoot() % dockerHost() % app.uri, - "failed to installl compose app"); + "failed to install compose app"); } static bool checkAppStatus(const AppEngine::App& app, const Json::Value& status) { diff --git a/src/composeappmanager.cc b/src/composeappmanager.cc index bbe2309a..73de436d 100644 --- a/src/composeappmanager.cc +++ b/src/composeappmanager.cc @@ -405,8 +405,8 @@ data::InstallationResult ComposeAppManager::install(const Uptane::Target& target } } else { - LOG_INFO << "Apps' containers will be re-created and started just after succesfull boot on the new ostree version"; - res.description += "\n# Fecthed Apps' containers will be created and started after reboot\n"; + LOG_INFO << "Apps' containers will be re-created and started just after successful boot on the new ostree version"; + res.description += "\n# Fetched Apps' containers will be created and started after reboot\n"; // don't prune Compose Apps' images because new images are not used by any containers and can be removed as a // result of pruning. prune_images = false; diff --git a/src/rootfstreemanager.cc b/src/rootfstreemanager.cc index c432063a..e28e5bd0 100644 --- a/src/rootfstreemanager.cc +++ b/src/rootfstreemanager.cc @@ -249,10 +249,10 @@ void RootfsTreeManager::setRemote(const std::string& name, const std::string& ur data::InstallationResult RootfsTreeManager::verifyBootloaderUpdate(const Uptane::Target& target) const { if (cfg_.UpdateBlock && boot_fw_update_status_->isUpdateInProgress()) { - LOG_WARNING << "Bootlader update is in progress." + LOG_WARNING << "Bootloader update is in progress." " A device must be rebooted to confirm and finalize the boot fw update" " before installation of a new Target with ostree/rootfs change"; - return data::InstallationResult(data::ResultCode::Numeric::kNeedCompletion, "bootlader update is in progress"); + return data::InstallationResult(data::ResultCode::Numeric::kNeedCompletion, "bootloader update is in progress"); } if (!boot_fw_update_status_->isRollbackProtectionEnabled()) { From 5ace05c38c82714ec9578e1cfaffa295c9bf55cd Mon Sep 17 00:00:00 2001 From: Andre Detsch Date: Fri, 28 Jun 2024 15:32:06 -0300 Subject: [PATCH 2/2] api: Avoid using "Downloading" in the logs when fetching local data Use "Copying" instead. Although the method is still called Download, seeing a "Downloading" message in the logs is misleading to the users. Signed-off-by: Andre Detsch --- src/api.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api.cc b/src/api.cc index c8ff0dd7..72ed7ed1 100644 --- a/src/api.cc +++ b/src/api.cc @@ -920,7 +920,7 @@ class LocalLiteInstall : public LiteInstall { reason = "Update to " + target_->filename(); } - client_->logTarget("Downloading: ", *target_); + client_->logTarget("Copying: ", *target_); auto downloader = createOfflineDownloader(); client_->notifyDownloadStarted(*target_, reason);