dinislage/foreman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34 from nz/empty-foreman-file

Browse Source 
Gracefully handle the 'garbage in' of an empty .foreman file.
This commit is contained in:
David Dollar
2011-06-03 13:51:29 -07:00
parent fd234b8044 f4b1e3701b
commit 3e69b27f5f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/foreman/cli.rb
+1 -1
View File
@@ -86,7 +86,7 @@ private ######################################################################
def options def options
original_options = super original_options = super
return original_options unless File.exists?(".foreman") return original_options unless File.exists?(".foreman")
defaults = YAML::load_file(".foreman") defaults = YAML::load_file(".foreman") || {}
Thor::CoreExt::HashWithIndifferentAccess.new(defaults.merge(original_options)) Thor::CoreExt::HashWithIndifferentAccess.new(defaults.merge(original_options))
end end