Skip to content

Commit

Permalink
Merge pull request #165 from pelson/list_fix
Browse files Browse the repository at this point in the history
Fixed the case where conda-forge.yml wasn't defined correctly
  • Loading branch information
pelson committed May 13, 2016
2 parents 62e52fe + 5dc8f99 commit 1b3b588
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion conda_smithy/configure_feedstock.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ def main(forge_file_directory):
warnings.warn('No conda-forge.yml found. Assuming default options.')
else:
with open(forge_yml, "r") as fh:
file_config = list(yaml.load_all(fh))[0]
file_config = list(yaml.load_all(fh))[0] or {}
# The config is just the union of the defaults, and the overriden
# values.
for key, value in file_config.items():
Expand Down

0 comments on commit 1b3b588

Please sign in to comment.