Skip to content

Commit

Permalink
unpacker: Check for filter errors while committing tmpfiles too
Browse files Browse the repository at this point in the history
This masked an issue in a change I was working on in the filter.

Closes: #624
Approved by: jlebon
  • Loading branch information
cgwalters authored and rh-atomic-bot committed Feb 14, 2017
1 parent 775c781 commit 325de9d
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/libpriv/rpmostree-unpacker.c
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,13 @@ import_rpm_to_repo (RpmOstreeUnpacker *self,
if (!ostree_repo_write_dfd_to_mtree (repo, tmpdir_dfd, ".", mtree, modifier,
cancellable, error))
goto out;

/* check if any of the cbs set an error */
if (cb_error != NULL)
{
*error = cb_error;
goto out;
}
}

if (!ostree_repo_write_mtree (repo, mtree, &root, cancellable, error))
Expand Down

0 comments on commit 325de9d

Please sign in to comment.