Change manual Command .status to use run_inherited

cgwalters · cgwalters · commit f08bae1a9c64 · 2025-07-30T17:03:14.000-04:00
This re-implements 675bbf6 in a cleaner way using the new `run_inherited` API. Signed-off-by: Colin Walters <walters@verbum.org>
diff --git a/rust/src/bwrap.rs b/rust/src/bwrap.rs
@@ -2,11 +2,11 @@
 
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
-use bootc_internal_utils::CommandRunExt;
 use crate::cxxrsutil::*;
 use crate::ffi::BubblewrapMutability;
 use crate::normalization;
 use anyhow::{Context, Result};
+use bootc_internal_utils::CommandRunExt;
 use camino::Utf8Path;
 use camino::Utf8PathBuf;
 use cap_std::fs::Dir;
diff --git a/rust/src/compose.rs b/rust/src/compose.rs
@@ -29,11 +29,11 @@ use ostree_ext::ostree::MutableTree;
 use ostree_ext::{container as ostree_container, glib};
 use ostree_ext::{oci_spec, ostree};
 
-use bootc_internal_utils::CommandRunExt;
 use crate::containers_storage::Mount;
 use crate::cxxrsutil::{CxxResult, FFIGObjectWrapper};
 use crate::isolation::self_command;
 use crate::{RPMOSTREE_RPMDB_LOCATION, RPMOSTREE_SYSIMAGE_RPMDB};
+use bootc_internal_utils::CommandRunExt;
 
 const SYSROOT: &str = "sysroot";
 const USR: &str = "usr";
@@ -374,7 +374,7 @@ impl BuildChunkedOCIOpts {
         };
         let manifest_data = manifest_data_tmpfile.as_ref().map(|t| t.path());
 
-        let st = crate::isolation::self_command()
+        crate::isolation::self_command()
             .args([
                 "compose",
                 "container-encapsulate",
@@ -397,10 +397,8 @@ impl BuildChunkedOCIOpts {
                     manifest.as_os_str(),
                 ]
             }))
-            .status()?;
-        if !st.success() {
-            anyhow::bail!("Failed to run compose container-encapsulate: {st:?}");
-        }
+            .run_inherited()
+            .context("Invoking compose container-encapsulate")?;
 
         drop(rootfs);
         // Ensure our tempdir is only dropped now
@@ -750,7 +748,7 @@ impl RootfsOpts {
         };
 
         // Just build the root filesystem tree
-        let st = self_command()
+        self_command()
             .args([
                 "compose",
                 "install",
@@ -777,10 +775,8 @@ impl RootfsOpts {
             // it won't be able to. We should lower the xattr stripping into
             // rpm-ostree ideally.
             .env("DRACUT_NO_XATTR", "1")
-            .status()?;
-        if !st.success() {
-            anyhow::bail!("Executing compose install: {st:?}");
-        }
+            .run_inherited()
+            .context("Executing compose install")?;
 
         // Clear everything in the tempdir; at this point we may have hardlinks into
         // the pkgcache repo, which we don't need because we're producing a flat
@@ -1207,7 +1203,7 @@ pub(crate) fn compose_image(args: Vec<String>) -> CxxResult<()> {
         compose_args_extra.extend(["--source-root", path.as_str()]);
     }
 
-    let st = self_command()
+    self_command()
         .args([
             "compose",
             "tree",
@@ -1226,10 +1222,7 @@ pub(crate) fn compose_image(args: Vec<String>) -> CxxResult<()> {
         .args(opt.lockfile_strict.then_some("--ex-lockfile-strict"))
         .args(compose_args_extra)
         .arg(opt.manifest.as_str())
-        .status()?;
-    if !st.success() {
-        return Err(format!("Failed to run compose tree: {st:?}").into());
-    }
+        .run_inherited()?;
 
     if !changed_path.exists() {
         return Ok(());
@@ -1265,7 +1258,7 @@ pub(crate) fn compose_image(args: Vec<String>) -> CxxResult<()> {
         })
         .transpose()?;
 
-    let st = self_command()
+    self_command()
         .args(["compose", "container-encapsulate"])
         .args(label_args)
         .args(previous_arg)
@@ -1277,10 +1270,7 @@ pub(crate) fn compose_image(args: Vec<String>) -> CxxResult<()> {
             commitid.as_str(),
             tempdest.as_deref().unwrap_or(target_imgref.as_str()),
         ])
-        .status()?;
-    if !st.success() {
-        return Err(format!("Failed to run compose container-encapsulate: {st:?}").into());
-    }
+        .run_inherited()?;
 
     if let Some(tempdest) = tempdest {
         let mut c = Command::new("skopeo");
diff --git a/rust/src/composepost.rs b/rust/src/composepost.rs
@@ -8,13 +8,13 @@
 use crate::bwrap;
 use crate::bwrap::Bubblewrap;
 use crate::capstdext::dirbuilder_from_mode;
-use bootc_internal_utils::CommandRunExt;
 use crate::cxxrsutil::*;
 use crate::ffi::BubblewrapMutability;
 use crate::ffiutil::ffi_dirfd;
 use crate::normalization;
 use crate::treefile::{OptUsrLocal, Treefile};
 use anyhow::{anyhow, bail, Context, Result};
+use bootc_internal_utils::CommandRunExt;
 use camino::{Utf8Path, Utf8PathBuf};
 use cap_std::fs::Dir;
 use cap_std::fs_utf8::Dir as Utf8Dir;
diff --git a/rust/src/container.rs b/rust/src/container.rs
@@ -30,11 +30,11 @@ use ostree_ext::oci_spec::image::{Arch, Os, PlatformBuilder};
 use ostree_ext::prelude::*;
 use ostree_ext::{gio, oci_spec, ostree};
 
-use bootc_internal_utils::CommandRunExt;
 use crate::cxxrsutil::FFIGObjectReWrap;
 use crate::fsutil::{self, FileHelpers, ResolvedOstreePaths};
 use crate::progress::progress_task;
 use crate::CxxResult;
+use bootc_internal_utils::CommandRunExt;
 
 const COMPONENT_XATTR: &CStr = c"user.component";
 
diff --git a/rust/src/initramfs.rs b/rust/src/initramfs.rs
@@ -1,9 +1,9 @@
 //! Generate an "overlay" initramfs image
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
-use bootc_internal_utils::CommandRunExt;
 use crate::cxxrsutil::*;
 use anyhow::{Context, Result};
+use bootc_internal_utils::CommandRunExt;
 use camino::Utf8Path;
 use cap_std::fs::Dir;
 use cap_std::io_lifetimes::AsFilelike;
diff --git a/rust/src/testutils.rs b/rust/src/testutils.rs
@@ -9,9 +9,9 @@
 //! This backs the hidden `rpm-ostree testutils` CLI.  Subject
 //! to change.
 
-use bootc_internal_utils::CommandRunExt;
 use crate::cxxrsutil::*;
 use anyhow::{Context, Result};
+use bootc_internal_utils::CommandRunExt;
 use cap_std::fs::FileType;
 use cap_std::fs::{Dir, MetadataExt, Permissions, PermissionsExt};
 use cap_std_ext::cap_std;
diff --git a/rust/src/treefile.rs b/rust/src/treefile.rs
@@ -21,6 +21,7 @@
 
 use crate::{compose_postprocess_scripts, cxxrsutil::*};
 use anyhow::{anyhow, bail, Context, Result};
+use bootc_internal_utils::CommandRunExt;
 use camino::{Utf8Path, Utf8PathBuf};
 use cap_std::fs::MetadataExt as _;
 use cap_std_ext::cap_std::fs::Dir;
@@ -851,10 +852,9 @@ impl Treefile {
             if let Some(d) = self.directory.as_deref() {
                 cmd.env("RPMOSTREE_WORKDIR", d);
             }
-            let st = cmd.cwd_dir(rootfs.try_clone()?).status()?;
-            if !st.success() {
-                return Err(anyhow!("Failed to execute {name}: {st}"));
-            }
+            cmd.cwd_dir(rootfs.try_clone()?)
+                .run_inherited()
+                .with_context(|| format!("Failed to execute {name}"))?;
         }
         Ok(())
     }
