diff --git a/Makefile b/Makefile index 782f2504..f436df89 100644 --- a/Makefile +++ b/Makefile @@ -144,8 +144,8 @@ db-prepare-$(1): @echo "============================" @mkdir -p database/$(1)/mapping @cp settings/$(1)/devices.yaml database/$(1)/mapping/ - @+source settings/$(1).sh && $(IN_ENV) ./utils/update_parts.py $(1) - @+source settings/$(1).sh && $(IN_ENV) ./utils/update_resources.py $(1) + @+SKIP_ENV=true source settings/$(1).sh && $(IN_ENV) ./utils/update_parts.py $(1) + @+SKIP_ENV=true source settings/$(1).sh && $(IN_ENV) ./utils/update_resources.py $(1) db-$(1): +source settings/$(1).sh && $$(MAKE) -C fuzzers diff --git a/utils/create_environment.py b/utils/create_environment.py index 852c2218..9303ebdd 100755 --- a/utils/create_environment.py +++ b/utils/create_environment.py @@ -49,6 +49,13 @@ def get_environment_variables(): def main(): + # Only dump the environment when the resource.yaml file for the family + # exists to prevent errors during the creation on the stdout. + # SKIP_ENV in the environment turns off the environment dump for updating + # all parts and resources, which will create the resource.yaml file. + if 'SKIP_ENV' in os.environ: + return + environment = get_environment_variables() for key, value in environment.items():