Merge pull request #1291 from cgwalters/status-bootentry

status: Prep work for #1285

Author: cgwalters

lib/src/status.rs

@@ -359,9 +359,10 @@ fn write_row_name(mut out: impl Write, s: &str, prefix_len: usize) -> Result<()>
 }
 
 /// Write the data for a container image based status.
-fn human_render_imagestatus(
+fn human_render_slot(
     mut out: impl Write,
     slot: Slot,
+    entry: &crate::spec::BootEntry,
     image: &crate::spec::ImageStatus,
 ) -> Result<()> {
     let transport = &image.image.transport;
@@ -407,10 +408,18 @@ fn human_render_imagestatus(
         writeln!(out, "{timestamp}")?;
     }
 
+    tracing::debug!("pinned={}", entry.pinned);
+
     Ok(())
 }
 
-fn human_render_ostree(mut out: impl Write, slot: Slot, ostree_commit: &str) -> Result<()> {
+/// Output a rendering of a non-container boot entry.
+fn human_render_slot_ostree(
+    mut out: impl Write,
+    slot: Slot,
+    entry: &crate::spec::BootEntry,
+    ostree_commit: &str,
+) -> Result<()> {
     // TODO consider rendering more ostree stuff here like rpm-ostree status does
     let prefix = match slot {
         Slot::Staged => "  Staged ostree".into(),
@@ -421,6 +430,7 @@ fn human_render_ostree(mut out: impl Write, slot: Slot, ostree_commit: &str) ->
     writeln!(out, "{prefix}")?;
     write_row_name(&mut out, "Commit", prefix_len)?;
     writeln!(out, "{ostree_commit}")?;
+    tracing::debug!("pinned={}", entry.pinned);
     Ok(())
 }
 
@@ -438,9 +448,9 @@ fn human_readable_output_booted(mut out: impl Write, host: &Host) -> Result<()>
                 writeln!(out)?;
             }
             if let Some(image) = &host_status.image {
-                human_render_imagestatus(&mut out, slot_name, image)?;
+                human_render_slot(&mut out, slot_name, host_status, image)?;
             } else if let Some(ostree) = host_status.ostree.as_ref() {
-                human_render_ostree(&mut out, slot_name, &ostree.checksum)?;
+                human_render_slot_ostree(&mut out, slot_name, host_status, &ostree.checksum)?;
             } else {
                 writeln!(out, "Current {slot_name} state is unknown")?;
             }