aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2024-07-31 01:46:59 -0400
committerJoseph Hunkeler <jhunkeler@gmail.com>2024-07-31 01:46:59 -0400
commit87d88214a0183e0e0ab04358e36e978e951f39c9 (patch)
treea9f51b1dc61d0f324a67a4e043e0ceb07bcbed0d
parentf3dac9e97a4538021d9cd2f464470ec132050705 (diff)
downloadstasis-87d88214a0183e0e0ab04358e36e978e951f39c9.tar.gz
Read the main and deferred lists no matter what
-rw-r--r--src/delivery.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/delivery.c b/src/delivery.c
index 4264016..b1997f6 100644
--- a/src/delivery.c
+++ b/src/delivery.c
@@ -940,9 +940,11 @@ void delivery_conda_show(struct Delivery *ctx) {
printf("%-20s %-10s\n", "Prefix:", ctx->storage.conda_install_prefix);
puts("Native Packages:");
- if (strlist_count(ctx->conda.conda_packages)) {
+ if (strlist_count(ctx->conda.conda_packages) || strlist_count(ctx->conda.conda_packages_defer)) {
struct StrList *list_conda = strlist_init();
- strlist_append_strlist(list_conda, ctx->conda.conda_packages);
+ if (strlist_count(ctx->conda.conda_packages)) {
+ strlist_append_strlist(list_conda, ctx->conda.conda_packages);
+ }
if (strlist_count(ctx->conda.conda_packages_defer)) {
strlist_append_strlist(list_conda, ctx->conda.conda_packages_defer);
}
@@ -961,9 +963,11 @@ void delivery_conda_show(struct Delivery *ctx) {
}
puts("Python Packages:");
- if (strlist_count(ctx->conda.pip_packages)) {
+ if (strlist_count(ctx->conda.pip_packages) || strlist_count(ctx->conda.pip_packages_defer)) {
struct StrList *list_python = strlist_init();
- strlist_append_strlist(list_python, ctx->conda.pip_packages);
+ if (strlist_count(ctx->conda.pip_packages)) {
+ strlist_append_strlist(list_python, ctx->conda.pip_packages);
+ }
if (strlist_count(ctx->conda.pip_packages_defer)) {
strlist_append_strlist(list_python, ctx->conda.pip_packages_defer);
}