mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-04-03 14:56:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

dir: include NULL url in flatpak_dir_log() call

Browse Source 
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 dbc90df513)
(cherry picked from commit 5a16666bdc)

Closes: #3115
Approved by: alexlarsson
This commit is contained in:
Will Thompson
2019-06-05 10:58:14 +01:00
committed by Atomic Bot
parent b89f29db2b
commit b415f607c1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/flatpak-dir.c
View File

@@ -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: