Skip to content

Commit

Permalink
daemon/deploy: Finish OstreeAsyncProgress after pull
Browse files Browse the repository at this point in the history
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 c9cbad9 (coreos#1676).

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1859269
  • Loading branch information
jlebon authored and openshift-merge-robot committed Jul 28, 2020
1 parent 1c9ea5d commit 752f4f0
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/daemon/rpmostreed-transaction-types.c
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,7 @@ deploy_transaction_execute (RpmostreedTransaction *transaction,
if (!ostree_repo_pull (repo, local_repo_uri, (char**)refs_to_fetch,
OSTREE_REPO_PULL_FLAGS_NONE, progress, cancellable, error))
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));

/* as far as the rest of the code is concerned, we're rebasing to :SHA256 now */
Expand Down

0 comments on commit 752f4f0

Please sign in to comment.