diff options
| author | Matthew Leeds <matthew.leeds@endlessm.com> | 2018-09-16 22:36:29 -0700 |
|---|---|---|
| committer | Matthew Leeds <matthew.leeds@endlessm.com> | 2018-09-17 08:38:49 -0700 |
| commit | 888f93214aa09e92616c2838faa2dbb7c995d903 (patch) | |
| tree | 40fa2d338bb98e005a544125c67f1395076dac26 | |
| parent | d129175eaabc2fe612f5aa00d429561bc8e7a0f0 (diff) | |
| download | flatpak-fix-create-usb-error-overwrite.tar.gz | |
create-usb: Don't leave a GError setfix-create-usb-error-overwrite
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().
| -rw-r--r-- | app/flatpak-builtins-create-usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
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"), |