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

system-helper: Don't pass NULL for progress

Browse Source 
When calling into FlatpakDir apis that take an
OstreeProgress, always pass a no-op instance,
never NULL.

Closes: #2468
Approved by: alexlarsson
This commit is contained in:
Matthias Clasen 2018-12-22 14:12:53 -05:00 committed by Atomic Bot
parent 77bfe8493e
commit 69d5692529
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
system-helper/flatpak-system-helper.c
View File

@ -567,22 +567,25 @@ handle_deploy_appstream (FlatpakSystemHelper *object,
g_autoptr(GError) first_error = NULL;
g_autoptr(GError) second_error = NULL;
g_autoptr(GMainContextPopDefault) main_context = NULL;
g_autoptr(OstreeAsyncProgress) ostree_progress = NULL;
/* Work around ostree-pull spinning the default main context for the sync calls */
main_context = flatpak_main_context_new_default ();
ostree_progress = ostree_async_progress_new_and_connect (no_progress_cb, NULL);
if (!flatpak_dir_pull_untrusted_local (system, arg_repo_path,
arg_origin,
new_branch,
NULL,
NULL,
ostree_progress,
NULL, &first_error))
{
if (!flatpak_dir_pull_untrusted_local (system, arg_repo_path,
arg_origin,
old_branch,
NULL,
NULL,
ostree_progress,
NULL, &second_error))
{
g_prefix_error (&first_error, "Error updating appstream2: ");