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

postprocess: prefix more errors

Browse Source 
This is a follow-up to #845. Judging from the output of the erroring
compose[1], the error seems to happen after committing all the objects.
Add more detailed prefixes there.

[1] https://lists.fedoraproject.org/archives/list/cloud@lists.fedoraproject.org/thread/2MZ5KFEVITKWJZYOTSAYCZ7XYAJCWZCT/

Closes: #846
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2017-06-23 11:32:01 -04:00 committed by Atomic Bot
parent 64b049b8eb
commit 7b6237c14f
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libpriv/rpmostree-postprocess.c
View File

@ -1764,11 +1764,7 @@ rpmostree_commit (int rootfs_fd,
if (sepolicy && ostree_sepolicy_get_name (sepolicy) != NULL) if (sepolicy && ostree_sepolicy_get_name (sepolicy) != NULL)
ostree_repo_commit_modifier_set_sepolicy (commit_modifier, sepolicy); ostree_repo_commit_modifier_set_sepolicy (commit_modifier, sepolicy);
else if (enable_selinux) else if (enable_selinux)
{ return glnx_throw (error, "SELinux enabled, but no policy found");
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"SELinux enabled, but no policy found");
return FALSE;
}
if (devino_cache) if (devino_cache)
ostree_repo_commit_modifier_set_devino_cache (commit_modifier, devino_cache); ostree_repo_commit_modifier_set_devino_cache (commit_modifier, devino_cache);
@ -1805,11 +1801,11 @@ rpmostree_commit (int rootfs_fd,
g_thread_join (g_steal_pointer (&commit_thread)); g_thread_join (g_steal_pointer (&commit_thread));
if (!tdata.success) if (!tdata.success)
return FALSE; return glnx_prefix_error (error, "While writing rootfs to mtree");
g_autoptr(GFile) root_tree = NULL; g_autoptr(GFile) root_tree = NULL;
if (!ostree_repo_write_mtree (repo, mtree, &root_tree, cancellable, error)) if (!ostree_repo_write_mtree (repo, mtree, &root_tree, cancellable, error))
return glnx_prefix_error (error, "Writing tree"); return glnx_prefix_error (error, "While writing tree");
g_autofree char *parent_revision = NULL; g_autofree char *parent_revision = NULL;
if (refname) if (refname)
@ -1822,19 +1818,19 @@ rpmostree_commit (int rootfs_fd,
if (!ostree_repo_write_commit (repo, parent_revision, "", "", metadata, if (!ostree_repo_write_commit (repo, parent_revision, "", "", metadata,
(OstreeRepoFile*)root_tree, &new_revision, (OstreeRepoFile*)root_tree, &new_revision,
cancellable, error)) cancellable, error))
return FALSE; return glnx_prefix_error (error, "While writing commit");
if (gpg_keyid) if (gpg_keyid)
{ {
if (!ostree_repo_sign_commit (repo, new_revision, gpg_keyid, NULL, if (!ostree_repo_sign_commit (repo, new_revision, gpg_keyid, NULL,
cancellable, error)) cancellable, error))
return FALSE; return glnx_prefix_error (error, "While signing commit");
} }
if (write_commitid_to) if (write_commitid_to)
{ {
if (!g_file_set_contents (write_commitid_to, new_revision, -1, error)) if (!g_file_set_contents (write_commitid_to, new_revision, -1, error))
return FALSE; return glnx_prefix_error (error, "While writing to '%s'", write_commitid_to);
} }
else if (refname) else if (refname)
ostree_repo_transaction_set_ref (repo, NULL, refname, new_revision); ostree_repo_transaction_set_ref (repo, NULL, refname, new_revision);