From 87d88214a0183e0e0ab04358e36e978e951f39c9 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 31 Jul 2024 01:46:59 -0400 Subject: Read the main and deferred lists no matter what --- src/delivery.c | 12 ++++++++---- 1 file 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); } -- cgit