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

info: Only load from specified installation

Browse Source 
flatpak_find_deploy_for_ref() will look for a deploy across all
installations, but we want to use the user-specified one, e.g. user if
--user was passed.

Pointed out here:
https://github.com/flatpak/flatpak/pull/3853#discussion_r487711857

(cherry picked from commit d7cca22d7c)
This commit is contained in:
Phaedrus Leeds
2020-09-14 10:58:54 -07:00
committed by Alexander Larsson
parent ab3aa8d7db
commit 7df39e636d
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/flatpak-builtins-info.c
View File

@@ -145,7 +145,7 @@ flatpak_builtin_info (int argc, char **argv, GCancellable *cancellable, GError *
if (deploy_data == NULL)
return FALSE;
deploy = flatpak_find_deploy_for_ref (ref, NULL, NULL, error);
deploy = flatpak_dir_load_deployed (dir, ref, NULL, cancellable, error);
if (deploy == NULL)
return FALSE;
@@ -406,12 +406,10 @@ flatpak_builtin_info (int argc, char **argv, GCancellable *cancellable, GError *
if (opt_show_metadata)
{
g_autoptr(GFile) deploy_dir = NULL;
g_autoptr(GFile) file = NULL;
g_autofree char *data = NULL;
gsize data_size;
deploy_dir = flatpak_dir_get_if_deployed (dir, ref, NULL, cancellable);
file = g_file_get_child (deploy_dir, "metadata");
if (!g_file_load_contents (file, cancellable, &data, &data_size, NULL, error))