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

Gracefully handle the 'garbage in' of an empty .foreman file.
2011-06-03 13:51:29 -07:00
parent fd234b8044 f4b1e3701b
commit 3e69b27f5f
1 changed files with 1 additions and 1 deletions
--- a/lib/foreman/cli.rb
+++ b/lib/foreman/cli.rb
@@ -86,7 +86,7 @@ private ######################################################################
  def options
    original_options = super
    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))
  end