File 0005-dir-include-NULL-url-in-flatpak_dir_log-ca... of Package flatpak.14328

Overview Repositories Revisions Requests Users Attributes Meta

File 0005-dir-include-NULL-url-in-flatpak_dir_log-call.patch of Package flatpak.14328

From b415f607c1a23bfbf2dee683eccad165a6dda8f3 Mon Sep 17 00:00:00 2001
From: Will Thompson <wjt@endlessm.com>
Date: Wed, 5 Jun 2019 10:58:14 +0100
Subject: [PATCH] dir: include NULL url in flatpak_dir_log() call

I spotted this line in the output from `flatpak history`:

Jun  4 16:17:20	deploy install	com.discordapp.Discord	x86_64	stable	system	flathub	8a0fc700c701		Installed %s from %s	root (test)	flatpak-system-helper (gnome-software)	1.3.3

This is because the format string is passed as the 'url' parameter, the
first format parameter (the ref) is passed as the 'format' parameter,
and 'origin' is ignored because (fortunately) as far as I know, no
character significant to printf (like '%') is permitted in ref names.

Fix this by passing a NULL 'url', like the neighbouring call in
flatpak_dir_deploy_update().

(cherry picked from commit dbc90df513be5cd51efd21058401f5a41932d3d6)
(cherry picked from commit 5a16666bdc779994733b8deadb8006b5bb266f17)

Closes: #3115
Approved by: alexlarsson
---
 common/flatpak-dir.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index 1fc6a90c5..1e2fae4c9 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -7442,7 +7442,7 @@ flatpak_dir_deploy_install (FlatpakDir   *self,
   ret = TRUE;
 
   commit = flatpak_dir_read_active (self, ref, cancellable);
-  flatpak_dir_log (self, "deploy install", origin, ref, commit, old_active,
+  flatpak_dir_log (self, "deploy install", origin, ref, commit, old_active, NULL,
                    "Installed %s from %s", ref, origin);
 
 out:

Places

File 0005-dir-include-NULL-url-in-flatpak_dir_log-call.patch of Package flatpak.14328

Places