Merge pull request #5107 from HuijingHei/bump-ostree-ext

Bump ostree-ext to 0.15.1

Cargo.toml

@@ -72,7 +72,7 @@ nix = { version = "0.29.0", features = ["fs", "mount", "signal", "user"] }
 openssl = "0.10.66"
 once_cell = "1.19.0"
 os-release = "0.1.0"
-ostree-ext = "0.14"
+ostree-ext = "0.15"
 paste = "1.0"
 phf = { version = "0.11", features = ["macros"] }
 rand = "0.8.5"

rust/src/compose.rs

@@ -182,13 +182,15 @@ pub(crate) fn compose_image(args: Vec<String>) -> CxxResult<()> {
     let tempdir = Utf8Path::from_path(tempdir.path()).unwrap();
 
     let handle = tokio::runtime::Handle::current();
-    let proxy = handle.block_on(async {
-        let config = containers_image_proxy::ImageProxyConfig {
-            authfile: opt.authfile.as_ref().map(|v| v.as_std_path().to_owned()),
-            ..Default::default()
-        };
-        containers_image_proxy::ImageProxy::new_with_config(config).await
-    })?;
+    let proxy = handle
+        .block_on(async {
+            let config = containers_image_proxy::ImageProxyConfig {
+                authfile: opt.authfile.as_ref().map(|v| v.as_std_path().to_owned()),
+                ..Default::default()
+            };
+            containers_image_proxy::ImageProxy::new_with_config(config).await
+        })
+        .expect("Create an image proxy");
 
     let (_cachetempdir, cachedir) = match opt.cachedir {
         Some(p) => (None, p),

rust/src/sysroot_upgrade.rs

@@ -34,7 +34,7 @@ impl From<Box<ostree_container::store::LayeredImageState>> for crate::ffi::Conta
         crate::ffi::ContainerImageState {
             base_commit: s.base_commit,
             merge_commit: s.merge_commit,
-            image_digest: s.manifest_digest,
+            image_digest: s.manifest_digest.to_string(),
             version,
             cached_update_diff,
         }
@@ -50,7 +50,7 @@ fn layer_counts<'a>(layers: impl Iterator<Item = &'a ManifestLayerState>) -> (u3
             if v.commit.is_some() {
                 (stored + 1, (n_to_fetch, size_to_fetch))
             } else {
-                (stored, (n_to_fetch + 1, size_to_fetch + v.size()))
+                (stored, (n_to_fetch + 1, size_to_fetch + v.layer().size()))
             }
         },
     )