aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2024-10-04 17:52:24 -0400
committerJoseph Hunkeler <jhunkeler@gmail.com>2024-10-04 17:52:24 -0400
commit086187e9aa97b137188cf8a1fe872f3397b988e8 (patch)
treec015d402ff7d31e16b1bf6199a604144ede948a7
parentace6fe586ff30be57e708f81489b120204d6dd62 (diff)
downloadstasis-086187e9aa97b137188cf8a1fe872f3397b988e8.tar.gz
Fix release environment removal message
* Fix testing environment removal message * Fix tool installation error message
-rw-r--r--src/stasis_main.c10
1 files changed, 6 insertions, 4 deletions
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);