From bd81ec7b5dd5525bee455598ec1e56a1b979f8fa Mon Sep 17 00:00:00 2001 From: Matthew Leeds Date: Sun, 16 Sep 2018 22:36:29 -0700 Subject: [PATCH] create-usb: Don't leave a GError set This commit avoids passing the error pointer to flatpak_dir_get_deploy_data() in add_related() because we're not treating the error as fatal. Otherwise the already-set error pointer can get passed to flatpak_dir_update_summary() causing libostree to hit an assertion failure when it checks (error == NULL || *error == NULL) in _ostree_repo_lock_push(). Closes: #2110 Approved by: alexlarsson --- app/flatpak-builtins-create-usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/flatpak-builtins-create-usb.c b/app/flatpak-builtins-create-usb.c index 460ebdec..372a9f45 100644 --- a/app/flatpak-builtins-create-usb.c +++ b/app/flatpak-builtins-create-usb.c @@ -146,7 +146,7 @@ add_related (GHashTable *all_refs, g_assert (ext->ref); - ext_deploy_data = flatpak_dir_get_deploy_data (dir, ext->ref, cancellable, error); + ext_deploy_data = flatpak_dir_get_deploy_data (dir, ext->ref, cancellable, NULL); if (ext_deploy_data == NULL) { g_printerr (_("Warning: Omitting related ref ‘%s’ because it is not installed.\n"),