Skip to content

Commit

Permalink
Revert "main: Drop deprecated container-encapsulate entrypoint"
Browse files Browse the repository at this point in the history
This reverts commit 2d07002.

It turns out that this is used by osbuild today
https://github.com/osbuild/osbuild/blob/14d31633a4b14878735ed5222befb895b16de2d1/stages/org.osbuild.ostree.encapsulate#L112

We'll do a patch to port to the new API there but let's just
carry this for $time where values of $time are probably at least
a year.
  • Loading branch information
cgwalters committed Aug 4, 2023
1 parent 1b2c90d commit 2239d4d
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions rust/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ async fn inner_async_main(args: Vec<String>) -> Result<i32> {
"usroverlay" | "unlock" => builtins::usroverlay::entrypoint(args).map(|_| 0),
// A hidden wrapper to intercept some binaries in RPM scriptlets.
"scriptlet-intercept" => builtins::scriptlet_intercept::entrypoint(args).map(|_| 0),
// This is a deprecated entrypoint
"container-encapsulate" => {
rpmostree_rust::client::warn_future_incompatibility(
"This entrypoint is deprecated; use `rpm-ostree compose container-encapsulate` instead",
);
rpmostree_rust::container::container_encapsulate(args_orig).map(|_| 0)
.map_err(anyhow::Error::msg)
},
// C++ main
_ => Ok(rpmostree_rust::ffi::rpmostree_main(args)?),
}
Expand Down

0 comments on commit 2239d4d

Please sign in to comment.