Skip to content

Commit fe1d470

Browse files
committed
install: Rename clashing variable
I will need to access the outer `state` here in a later PR. Signed-off-by: Colin Walters <[email protected]>
1 parent 70a6c76 commit fe1d470

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lib/src/install.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -566,9 +566,9 @@ async fn initialize_ostree_root_from_self(
566566
options.proxy_cfg = proxy_cfg;
567567
println!("Creating initial deployment");
568568
let target_image = state.target_imgref.to_string();
569-
let state =
569+
let imgstate =
570570
ostree_container::deploy::deploy(&sysroot, stateroot, &src_imageref, Some(options)).await?;
571-
let digest = state.manifest_digest.as_str();
571+
let digest = imgstate.manifest_digest.as_str();
572572
println!("Installed: {target_image}");
573573
println!(" Digest: {digest}");
574574

@@ -598,7 +598,7 @@ async fn initialize_ostree_root_from_self(
598598

599599
let uname = rustix::system::uname();
600600

601-
let labels = crate::status::labels_of_config(&state.configuration);
601+
let labels = crate::status::labels_of_config(&imgstate.configuration);
602602
let timestamp = labels
603603
.and_then(|l| {
604604
l.get(oci_spec::image::ANNOTATION_CREATED)
@@ -607,7 +607,7 @@ async fn initialize_ostree_root_from_self(
607607
.and_then(crate::status::try_deserialize_timestamp);
608608
let aleph = InstallAleph {
609609
image: src_imageref.imgref.name.clone(),
610-
version: state.version().as_ref().map(|s| s.to_string()),
610+
version: imgstate.version().as_ref().map(|s| s.to_string()),
611611
timestamp,
612612
kernel: uname.release().to_str()?.to_string(),
613613
};

0 commit comments

Comments
 (0)