From 6b6408a7d0e3826a26e18529e13f88c5ce5912f4 Mon Sep 17 00:00:00 2001 From: Robert McQueen Date: Thu, 3 Aug 2017 10:23:39 +0100 Subject: [PATCH] lib/gpg: Correct missing line prefix with bad signatures In the case the signature time was bad, a line prefix was missing from the result of `ostree_gpg_verify_result_describe_variant()`. Closes: #1092 Approved by: cgwalters --- src/libostree/ostree-gpg-verify-result.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libostree/ostree-gpg-verify-result.c b/src/libostree/ostree-gpg-verify-result.c index ad160bc9..5be6b2e1 100644 --- a/src/libostree/ostree-gpg-verify-result.c +++ b/src/libostree/ostree-gpg-verify-result.c @@ -652,6 +652,9 @@ ostree_gpg_verify_result_describe_variant (GVariant *variant, if (exp_timestamp > 0) { + if (line_prefix != NULL) + g_string_append (output_buffer, line_prefix); + date_time_utc = g_date_time_new_from_unix_utc (exp_timestamp); if (date_time_utc == NULL) { @@ -664,9 +667,6 @@ ostree_gpg_verify_result_describe_variant (GVariant *variant, date_time_local = g_date_time_to_local (date_time_utc); formatted_date_time = g_date_time_format (date_time_local, "%c"); - if (line_prefix != NULL) - g_string_append (output_buffer, line_prefix); - if (sig_expired) { g_string_append_printf (output_buffer,