lib/kameleon/recipe.rb in kameleon-builder-2.10.2 vs lib/kameleon/recipe.rb in kameleon-builder-2.10.3
- old
+ new
@@ -91,11 +91,11 @@
Kameleon.ui.verbose("Loading #{@path}")
fail RecipeError, "Could not find this following recipe : #{@path}" \
unless File.file? @path
yaml_recipe = YAML.load_file @path
unless yaml_recipe.kind_of? Hash
- fail RecipeError, "Invalid yaml error : #{@path}"
+ fail RecipeError, "Invalid yaml: #{@path}"
end
update_steps_dirs()
extended_recipe_name = yaml_recipe.fetch("extend", "")
@@ -240,10 +240,10 @@
base_recipe_path << ".yaml" unless base_recipe_path.end_with? ".yaml"
fail RecipeError, "Could not find this following recipe : #{@recipe_path}" \
unless File.file? path
base_yaml_recipe = YAML.load_file base_recipe_path
unless yaml_recipe.kind_of? Hash
- fail RecipeError, "Invalid yaml error : #{base_yaml_recipe}"
+ fail RecipeError, "Invalid yaml: #{base_yaml_recipe}"
end
base_yaml_recipe.keys.each do |key|
if ["export", "bootstrap", "setup"].include? key
base_yaml_recipe.delete(key) unless yaml_recipe.keys.include? key
end