From 1943a58841469ddbc39481e778713353e1c74e25 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Wed, 1 May 2024 23:31:38 -0500 Subject: [PATCH] Remove sys.exit from parse_until_resolved --- conda_build/metadata.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/conda_build/metadata.py b/conda_build/metadata.py index 881dccb567..d8b463f622 100644 --- a/conda_build/metadata.py +++ b/conda_build/metadata.py @@ -1287,12 +1287,11 @@ def parse_until_resolved( ): """variant contains key-value mapping for additional functions and values for jinja2 variables""" - # undefined_jinja_vars is refreshed by self.parse again - undefined_jinja_vars = () # store the "final" state that we think we're in. reloading the meta.yaml file # can reset it (to True) final = self.final - # always parse again at least once. + + # always parse again at least once self.parse_again( permit_undefined_jinja=True, allow_no_other_outputs=allow_no_other_outputs, @@ -1300,6 +1299,8 @@ def parse_until_resolved( ) self.final = final + # recursively parse again so long as each iteration has fewer undefined jinja variables + undefined_jinja_vars = () while set(undefined_jinja_vars) != set(self.undefined_jinja_vars): undefined_jinja_vars = self.undefined_jinja_vars self.parse_again( @@ -1308,18 +1309,8 @@ def parse_until_resolved( bypass_env_check=bypass_env_check, ) self.final = final - if undefined_jinja_vars: - self.parse_again( - permit_undefined_jinja=False, - allow_no_other_outputs=allow_no_other_outputs, - bypass_env_check=bypass_env_check, - ) - sys.exit( - f"Undefined Jinja2 variables remain ({self.undefined_jinja_vars}). Please enable " - "source downloading and try again." - ) - # always parse again at the end, too. + # always parse again at the end without permit_undefined_jinja self.parse_again( permit_undefined_jinja=False, allow_no_other_outputs=allow_no_other_outputs,