Skip to content
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

compose: More error context for container-encapsulate #5267

Merged
merged 1 commit into from
Jan 30, 2025
Merged

compose: More error context for container-encapsulate #5267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion rust/src/compose.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,8 @@ impl BuildChunkedOCI {
])
.args(label_arg)
.args([commitid.as_str(), imgref.as_str()])
.run()?;
.run()
.context("Invoking compose container-encapsulate")?;

Ok(())
}
Expand Down
19 changes: 11 additions & 8 deletions rust/src/container.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,19 +235,20 @@ pub fn container_encapsulate(args: Vec<String>) -> CxxResult<()> {
let opt = ContainerEncapsulateOpts::parse_from(args);
let repo = &ostree_ext::cli::parse_repo(&opt.repo)?;
let (root, rev) = repo.read_commit(opt.ostree_ref.as_str(), gio::Cancellable::NONE)?;
let pkglist = progress_task("Reading packages", || -> Result<_> {
let cancellable = gio::Cancellable::new();
let cancellable = gio::Cancellable::new();
let pkglist: glib::Variant = {
let r = crate::ffi::package_variant_list_for_commit(
repo.reborrow_cxx(),
rev.as_str(),
cancellable.reborrow_cxx(),
)?;
let r: glib::Variant = unsafe { glib::translate::from_glib_full(r as *mut _) };
Ok(r)
})?;
)
.context("Reading package variant list")?;
unsafe { glib::translate::from_glib_full(r as *mut _) }
};

// Open the RPM database for this commit.
let q = crate::ffi::rpmts_for_commit(repo.reborrow_cxx(), rev.as_str())?;
let q =
crate::ffi::rpmts_for_commit(repo.reborrow_cxx(), rev.as_str()).context("Getting refts")?;

let mut state = MappingBuilder {
unpackaged_id: Rc::from(MappingBuilder::UNPACKAGED_ID),
Expand Down Expand Up @@ -279,7 +280,9 @@ pub fn container_encapsulate(args: Vec<String>) -> CxxResult<()> {
let arch = pkg.child_value(4);
let arch = arch.str().unwrap();
let nevra = Rc::from(gv_nevra_to_string(&pkg).into_boxed_str());
let pkgmeta = q.package_meta(name, arch)?;
let pkgmeta = q
.package_meta(name, arch)
.context("Querying package meta")?;
let buildtime = pkgmeta.buildtime();
if let Some((lowid, lowtime)) = lowest_change_time.as_mut() {
if *lowtime > buildtime {
Expand Down
Loading