log: Add missing "%" in "%m" log format strings
authorFilipe Brandenburger <filbranden@gmail.com>
Tue, 24 Sep 2019 22:31:27 +0000 (15:31 -0700)
committerMichael Biebl <biebl@debian.org>
Tue, 19 Nov 2019 08:17:12 +0000 (08:17 +0000)
These were clearly intended to be "%m" to display the human readable version
of the error stored in errno.

(cherry picked from commit 28b77ab246b88d05076080bbd69ca3c353fa0f27)
(cherry picked from commit 693e983988691df9ce701f44f0dd936744aa8d34)

Gbp-Pq: Name log-Add-missing-in-m-log-format-strings.patch

src/core/unit.c
src/shared/bootspec.c

index cedcb3f5b3f31edeeada5e22d7c145b72363ffe7..a1dc76aa6ab62d09c5dee186b885652d51a71cb9 100644 (file)
@@ -2788,7 +2788,7 @@ int unit_enqueue_rewatch_pids(Unit *u) {
 
                 r = sd_event_source_set_priority(s, SD_EVENT_PRIORITY_IDLE);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to adjust priority of event source for tidying watched PIDs: m");
+                        return log_error_errno(r, "Failed to adjust priority of event source for tidying watched PIDs: %m");
 
                 (void) sd_event_source_set_description(s, "tidy-watch-pids");
 
index b0c6e4885fa07b1473c013ed749cf2048ae22bf9..aa3b7731a34e9b62f237f2b2dfc9af76a9530db2 100644 (file)
@@ -876,7 +876,7 @@ static int verify_esp_blkid(
         errno = 0;
         r = blkid_probe_lookup_value(b, "PART_ENTRY_NUMBER", &v, NULL);
         if (r != 0)
-                return log_error_errno(errno ?: SYNTHETIC_ERRNO(EIO), "Failed to probe partition number of \"%s\": m", node);
+                return log_error_errno(errno ?: SYNTHETIC_ERRNO(EIO), "Failed to probe partition number of \"%s\": %m", node);
         r = safe_atou32(v, &part);
         if (r < 0)
                 return log_error_errno(r, "Failed to parse PART_ENTRY_NUMBER field.");