From 7a1a6c8ef26c787e4b6dd1602f3d158b37e81720 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Tue, 2 Jul 2019 15:09:07 -0700 Subject: fix Layout/EmptyLineAfterGuardClause i like this one, gives visual priority to returns or raises that are buried in the middle of things. Signed-off-by: Lamont Granquist --- lib/chef/cookbook_loader.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/chef/cookbook_loader.rb') diff --git a/lib/chef/cookbook_loader.rb b/lib/chef/cookbook_loader.rb index ada19baed7..b27d751d64 100644 --- a/lib/chef/cookbook_loader.rb +++ b/lib/chef/cookbook_loader.rb @@ -176,6 +176,7 @@ class Chef if mash.key?(cookbook_name) raise Chef::Exceptions::CookbookMergingError, "Cookbook merging is no longer supported, the cookbook named #{cookbook_name} can only appear once in the cookbook_path" end + mash[cookbook_name] = loader end mash -- cgit v1.2.1