From 779312a8f765f0e0ebdf5723af28f42050ba83eb Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 8 Aug 2024 11:31:57 -0500 Subject: [PATCH] Fix spaces in yum requirements --- conda_smithy/configure_feedstock.py | 5 +---- conda_smithy/templates/build_steps.sh.tmpl | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/conda_smithy/configure_feedstock.py b/conda_smithy/configure_feedstock.py index 8a67d5152..a5215d6fd 100644 --- a/conda_smithy/configure_feedstock.py +++ b/conda_smithy/configure_feedstock.py @@ -1373,10 +1373,7 @@ def generate_yum_requirements(forge_config, forge_dir): # "recipe/yum_requirements.txt" file. After updating that file, # run "conda smithy rerender" and this line will be updated # automatically. - /usr/bin/sudo -n yum install -y {} - - - """.format( + /usr/bin/sudo -n yum install -y {}""".format( " ".join(requirements) ) ) diff --git a/conda_smithy/templates/build_steps.sh.tmpl b/conda_smithy/templates/build_steps.sh.tmpl index dfee0d3f8..15ef26f6d 100644 --- a/conda_smithy/templates/build_steps.sh.tmpl +++ b/conda_smithy/templates/build_steps.sh.tmpl @@ -71,7 +71,7 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" # => Set a lower limit in a subshell for the `yum install`s only. ulimit -n 1024 {{ yum_build_setup }} -){% endif -%} +){%- endif %} # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"