Skip to content

compose: Simplify compose-image entrypoint #5295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cgwalters wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −4
Open

compose: Simplify compose-image entrypoint #5295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion rust/src/compose.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,8 @@ async fn fetch_previous_metadata(
pub(crate) fn compose_image(args: Vec<String>) -> CxxResult<()> {
let cancellable = gio::Cancellable::NONE;

let opt = ComposeImageOpts::parse_from(args.iter().skip(1));
let args = args.iter().map(|v| v.as_str());
let opt = ComposeImageOpts::parse_from(["image"].into_iter().chain(args));

let tempdir = tempfile::tempdir()?;
let tempdir = Utf8Path::from_path(tempdir.path()).unwrap();
Expand Down
4 changes: 1 addition & 3 deletions src/app/rpmostree-builtin-compose.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,7 @@ rpmostree_compose_builtin_image (int argc, char **argv, RpmOstreeCommandInvocati
{
rust::Vec<rust::String> rustargv;
g_assert_cmpint (argc, >, 0);
rustargv.push_back (std::string (argv[0]));
rustargv.push_back (std::string ("baseimage"));
for (int i = 1; i < argc; i++)
for (int i = 0; i < argc; i++)
rustargv.push_back (std::string (argv[i]));
CXX_TRY (rpmostreecxx::compose_image (rustargv), error);
return TRUE;
Expand Down