summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Sauve-Frankel <msf@fastly.com>2016-01-05 09:45:49 +0900
committerMathieu Sauve-Frankel <msf@fastly.com>2016-01-08 12:10:18 +0900
commit3d0b7d14d96422b05670da50e0fa0f25d847d504 (patch)
tree37a9b78f9600d2c61b827494ab2d7e822b761b93
parentc9d7e017de225db3e8b8610dc7e2f41242dbe730 (diff)
downloadchef-3d0b7d14d96422b05670da50e0fa0f25d847d504.tar.gz
don't blow up when json object has no recipes
fixes loading brand new node objects from json
-rw-r--r--lib/chef/node.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/node.rb b/lib/chef/node.rb
index 0c13e5474a..1b91777f0b 100644
--- a/lib/chef/node.rb
+++ b/lib/chef/node.rb
@@ -545,7 +545,7 @@ class Chef
if o.has_key?("run_list")
node.run_list.reset!(o["run_list"])
- else
+ elsif o.has_key?("recipes")
o["recipes"].each { |r| node.recipes << r }
end