From 892fcb895524701416a1d1bdcf9b172c439221cf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 25 May 2022 16:00:44 +0200 Subject: [PATCH] bootctl: when comparing versions, show the result In Fedora there was a mixup with versions (the version was prefixed with "v", and "v251" < "250"). This makes this easier to debug. --- src/boot/bootctl.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c index 652667e3309..cebb479e75d 100644 --- a/src/boot/bootctl.c +++ b/src/boot/bootctl.c @@ -718,10 +718,13 @@ static int version_check(int fd_from, const char *from, int fd_to, const char *t to); r = compare_version(a, b); + log_debug("Comparing versions: \"%s\" %s \"%s", a, comparison_operator(r), b); if (r < 0) - return log_warning_errno(SYNTHETIC_ERRNO(ESTALE), "Skipping \"%s\", since newer boot loader version in place already.", to); - else if (r == 0) - return log_info_errno(SYNTHETIC_ERRNO(ESTALE), "Skipping \"%s\", since same boot loader version in place already.", to); + return log_warning_errno(SYNTHETIC_ERRNO(ESTALE), + "Skipping \"%s\", since newer boot loader version in place already.", to); + if (r == 0) + return log_info_errno(SYNTHETIC_ERRNO(ESTALE), + "Skipping \"%s\", since same boot loader version in place already.", to); return 0; } -- 2.47.3