From 086187e9aa97b137188cf8a1fe872f3397b988e8 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 4 Oct 2024 17:52:24 -0400 Subject: Fix release environment removal message * Fix testing environment removal message * Fix tool installation error message --- src/stasis_main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/stasis_main.c') diff --git a/src/stasis_main.c b/src/stasis_main.c index b5d43e3..88a1809 100644 --- a/src/stasis_main.c +++ b/src/stasis_main.c @@ -498,9 +498,10 @@ int main(int argc, char *argv[]) { msg(STASIS_MSG_L1, "Creating release environment(s)\n"); if (ctx.meta.based_on && strlen(ctx.meta.based_on)) { if (conda_env_remove(env_name)) { - msg(STASIS_MSG_ERROR | STASIS_MSG_L2, "failed to remove release environment: %s\n", env_name_testing); - exit(1); + msg(STASIS_MSG_ERROR | STASIS_MSG_L2, "failed to remove release environment: %s\n", env_name); + exit(1); } + msg(STASIS_MSG_L2, "Based on release: %s\n", ctx.meta.based_on); if (conda_env_create_from_uri(env_name, ctx.meta.based_on)) { msg(STASIS_MSG_ERROR | STASIS_MSG_L2, "unable to install release environment using configuration file\n"); @@ -508,7 +509,7 @@ int main(int argc, char *argv[]) { } if (conda_env_remove(env_name_testing)) { - msg(STASIS_MSG_ERROR | STASIS_MSG_L2, "failed to remove testing environment\n"); + msg(STASIS_MSG_ERROR | STASIS_MSG_L2, "failed to remove testing environment %s\n", env_name_testing); exit(1); } if (conda_env_create_from_uri(env_name_testing, ctx.meta.based_on)) { @@ -544,9 +545,10 @@ int main(int argc, char *argv[]) { } if (pip_exec("install build")) { - msg(STASIS_MSG_ERROR | STASIS_MSG_L2, "'build' tool installation failed"); + msg(STASIS_MSG_ERROR | STASIS_MSG_L2, "'build' tool installation failed\n"); exit(1); } + } msg(STASIS_MSG_L1, "Filter deliverable packages\n"); delivery_defer_packages(&ctx, DEFER_CONDA); -- cgit From 3b1471e5003df6476273f6ebc515f98329f5b448 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 4 Oct 2024 17:53:02 -0400 Subject: Implement delivery_overylay_packages_from_env() --- src/stasis_main.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/stasis_main.c') diff --git a/src/stasis_main.c b/src/stasis_main.c index 88a1809..79277e0 100644 --- a/src/stasis_main.c +++ b/src/stasis_main.c @@ -548,6 +548,13 @@ int main(int argc, char *argv[]) { msg(STASIS_MSG_ERROR | STASIS_MSG_L2, "'build' tool installation failed\n"); exit(1); } + + if (ctx.meta.based_on) { + msg(STASIS_MSG_L1, "Generating package overlay from environment: %s\n", env_name); + if (delivery_overlay_packages_from_env(&ctx, env_name)) { + msg(STASIS_MSG_L2 | STASIS_MSG_ERROR, "%s", "Failed to generate package overlay. Resulting environment integrity cannot be guaranteed.\n"); + exit(1); + } } msg(STASIS_MSG_L1, "Filter deliverable packages\n"); -- cgit From 5fd32e305baeb357bc1e23d3992014b641dff3a6 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 4 Oct 2024 19:01:04 -0400 Subject: Use isempty to see if we're using based_on --- src/stasis_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/stasis_main.c') diff --git a/src/stasis_main.c b/src/stasis_main.c index 79277e0..737fafc 100644 --- a/src/stasis_main.c +++ b/src/stasis_main.c @@ -496,7 +496,7 @@ int main(int argc, char *argv[]) { } msg(STASIS_MSG_L1, "Creating release environment(s)\n"); - if (ctx.meta.based_on && strlen(ctx.meta.based_on)) { + if (!isempty(ctx.meta.based_on)) { if (conda_env_remove(env_name)) { msg(STASIS_MSG_ERROR | STASIS_MSG_L2, "failed to remove release environment: %s\n", env_name); exit(1); @@ -549,7 +549,7 @@ int main(int argc, char *argv[]) { exit(1); } - if (ctx.meta.based_on) { + if (!isempty(ctx.meta.based_on)) { msg(STASIS_MSG_L1, "Generating package overlay from environment: %s\n", env_name); if (delivery_overlay_packages_from_env(&ctx, env_name)) { msg(STASIS_MSG_L2 | STASIS_MSG_ERROR, "%s", "Failed to generate package overlay. Resulting environment integrity cannot be guaranteed.\n"); -- cgit