keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

daemon/deploy: Finish OstreeAsyncProgress after pull

Browse Source 
Otherwise it might still own tasks on the main context when reusing it
later on. And because it was already cleared, we can get `SIGSEGV`. See
also c9cbad94 (#1676).

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1859269
This commit is contained in:
Jonathan Lebon 2020-07-28 17:18:25 -04:00 committed by OpenShift Merge Robot
parent 1c9ea5dab3
commit 752f4f09de
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/daemon/rpmostreed-transaction-types.c
View File

@ -975,6 +975,7 @@ deploy_transaction_execute (RpmostreedTransaction *transaction,
if (!ostree_repo_pull (repo, local_repo_uri, (char**)refs_to_fetch, if (!ostree_repo_pull (repo, local_repo_uri, (char**)refs_to_fetch,
OSTREE_REPO_PULL_FLAGS_NONE, progress, cancellable, error)) OSTREE_REPO_PULL_FLAGS_NONE, progress, cancellable, error))
return glnx_prefix_error (error, "Pulling commit %s from local repo", rev); return glnx_prefix_error (error, "Pulling commit %s from local repo", rev);
ostree_async_progress_finish (progress);
rpmostree_transaction_emit_progress_end (RPMOSTREE_TRANSACTION (transaction)); rpmostree_transaction_emit_progress_end (RPMOSTREE_TRANSACTION (transaction));
/* as far as the rest of the code is concerned, we're rebasing to :SHA256 now */ /* as far as the rest of the code is concerned, we're rebasing to :SHA256 now */