Skip to content

importer: Add some error prefixing #1889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cgwalters wants to merge 2 commits into from
Closed

importer: Add some error prefixing #1889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91f3fff
importer: Add some error prefixing
cgwalters Aug 22, 2019
9ff6117
ci: More fixes for cosa build
cgwalters Aug 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .papr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ host:
distro: fedora/29/atomic

tests:
- ./ci/f29-cosa-build.sh
- ./ci/cosa-build.sh

timeout: 120m

Expand Down
5 changes: 3 additions & 2 deletions ci/f29-cosa-build.sh → ci/cosa-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ cosaimg=quay.io/coreos-assembler/coreos-assembler:latest
podman pull "${cosaimg}"

# Build rpm-ostree using cosa as a buildroot, and extract the result
podman run --privileged --rm \
podman run --security-opt label=disable --rm \
-v $(pwd):/srv/code -w /srv/code \
--entrypoint bash --user root \
"${cosaimg}" \
/bin/sh -c './ci/build.sh && make install DESTDIR=$(pwd)/installroot'
-c 'yum -y swap fedora-release-container fedora-release && ./ci/build.sh && make install DESTDIR=$(pwd)/installroot'

codedir=$(pwd)
mkdir fcos
Expand Down
11 changes: 5 additions & 6 deletions src/libpriv/rpmostree-importer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ import_rpm_to_repo (RpmOstreeImporter *self,
g_autoptr(OstreeMutableTree) mtree = ostree_mutable_tree_new ();
if (!ostree_repo_import_archive_to_mtree (repo, &opts, self->archive, mtree,
modifier, cancellable, error))
return FALSE;
return glnx_prefix_error (error, "Importing archive");

/* check if any of the cbs set an error */
if (cb_error != NULL)
Expand Down Expand Up @@ -921,7 +921,7 @@ import_rpm_to_repo (RpmOstreeImporter *self,

if (!ostree_repo_write_dfd_to_mtree (repo, tmpdir.fd, ".", mtree, modifier,
cancellable, error))
return FALSE;
return glnx_prefix_error (error, "Writing tmpfiles mtree");

/* check if any of the cbs set an error */
if (cb_error != NULL)
Expand All @@ -933,7 +933,7 @@ import_rpm_to_repo (RpmOstreeImporter *self,

g_autoptr(GFile) root = NULL;
if (!ostree_repo_write_mtree (repo, mtree, &root, cancellable, error))
return FALSE;
return glnx_prefix_error (error, "Writing mtree");

g_autoptr(GVariant) metadata = NULL;
if (!build_metadata_variant (self, &metadata, cancellable, error))
Expand All @@ -949,7 +949,7 @@ import_rpm_to_repo (RpmOstreeImporter *self,
if (!ostree_repo_write_commit_with_time (repo, NULL, "", "", metadata,
OSTREE_REPO_FILE (root), buildtime,
out_csum, cancellable, error))
return FALSE;
return glnx_prefix_error (error, "Writing commit");

return TRUE;
}
Expand All @@ -967,8 +967,7 @@ rpmostree_importer_run (RpmOstreeImporter *self,
if (!import_rpm_to_repo (self, &csum, cancellable, error))
{
g_autofree char *name = headerGetAsString (self->hdr, RPMTAG_NAME);
g_prefix_error (error, "Importing package %s: ", name);
return FALSE;
return glnx_prefix_error (error, "Importing package '%s'", name);
}

const char *branch = rpmostree_importer_get_ostree_branch (self);
Expand Down