Merge pull request #1045 from cgwalters/ext-context

ostree-ext/encapsulate: Add some error contexts
bootc-dev · Jan 21, 2025 · 2f90eff · 2f90eff
2 parents 0d88682 + ded8a6b
commit 2f90eff
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/ostree-ext/src/container/encapsulate.rs b/ostree-ext/src/container/encapsulate.rs
@@ -314,10 +314,11 @@ async fn build_impl(
         let (path, tag) = parse_oci_path_and_tag(dest.name.as_str());
         tracing::debug!("using OCI path={path} tag={tag:?}");
         if !Utf8Path::new(path).exists() {
-            std::fs::create_dir(path)?;
+            std::fs::create_dir(path).with_context(|| format!("Creating {path}"))?;
         }
-        let ocidir = Dir::open_ambient_dir(path, cap_std::ambient_authority())?;
-        let mut ocidir = OciDir::ensure(&ocidir)?;
+        let ocidir = Dir::open_ambient_dir(path, cap_std::ambient_authority())
+            .with_context(|| format!("Opening {path}"))?;
+        let mut ocidir = OciDir::ensure(&ocidir).context("Opening OCI")?;
         build_oci(repo, ostree_ref, &mut ocidir, tag, config, opts)?;
         None
     } else {