mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-24 16:57:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix error handling while deploying AppStream

Browse Source 
Setting an error with second_error->message is going to work poorly
when second_error has never been set non-NULL.

Related to #1845, although not necessarily the full solution.

Signed-off-by: Simon McVittie <smcv@collabora.com>

Closes: #1867
Approved by: alexlarsson
This commit is contained in:
Simon McVittie
2018-07-07 12:35:10 +01:00
committed by Atomic Bot
parent 98fd052695
commit 7179c12e22
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -589,7 +589,7 @@ handle_deploy_appstream (FlatpakSystemHelper *object,
{
if (!flatpak_dir_pull (system, state, old_branch, NULL, NULL, NULL, NULL,
FLATPAK_PULL_FLAGS_NONE, OSTREE_REPO_PULL_FLAGS_UNTRUSTED, ostree_progress,
NULL, NULL))
NULL, &second_error))
{
g_prefix_error (&first_error, "Error updating appstream2: ");
g_prefix_error (&second_error, "%s; Error updating appstream: ", first_error->message);