ahill/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-26 14:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

history: Fix exclusion of temp repos

Browse Source 
Without this change there are history entries showing pulls into
temporary repos which we don't want.

(cherry picked from commit e18df8379a88fd1cd0272d6a6cbec4afc57d1397)
This commit is contained in:
Phaedrus Leeds 2021-10-28 12:37:51 -07:00 committed by Phaedrus Leeds
parent 2cfce0f1fd
commit 77303bd41d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/flatpak-builtins-history.c
View File

@ -161,6 +161,7 @@ print_history (GPtrArray *dirs,
(!reverse && sd_journal_next (j) > 0))
{
g_autofree char *ref_str = NULL;
g_autofree char *remote = NULL;
/* determine whether to skip this entry */
@ -174,14 +175,19 @@ print_history (GPtrArray *dirs,
if (ref_str && ref_str[0] && g_str_has_prefix (ref_str, "appstream"))
continue;
remote = get_field (j, "REMOTE", error);
if (*error)
return FALSE;
/* Exclude pull to temp repo */
if (remote && remote[0] == '/')
continue;
if (dirs)
{
gboolean include = FALSE;
g_autofree char *installation = get_field (j, "INSTALLATION", NULL);
if (installation && installation[0] == '/')
include = TRUE; /* pull to a temp repo */
for (i = 0; i < dirs->len && !include; i++)
{
g_autofree char *name = flatpak_dir_get_name (dirs->pdata[i]);
@ -268,9 +274,6 @@ print_history (GPtrArray *dirs,
}
else if (strcmp (columns[k].name, "remote") == 0)
{
g_autofree char *remote = get_field (j, "REMOTE", error);
if (*error)
return FALSE;
flatpak_table_printer_add_column (printer, remote);
}
else if (strcmp (columns[k].name, "commit") == 0)