diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2019-07-02 15:09:07 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2019-07-02 15:09:07 -0700 |
| commit | 7a1a6c8ef26c787e4b6dd1602f3d158b37e81720 (patch) | |
| tree | 1e390cd535b38368d091cbb33e5d419408d5ce00 /lib/chef/cookbook_loader.rb | |
| parent | 77f8739a4741e2370e40ec39345a92a6ea393a1a (diff) | |
| download | chef-7a1a6c8ef26c787e4b6dd1602f3d158b37e81720.tar.gz | |
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 <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef/cookbook_loader.rb')
| -rw-r--r-- | lib/chef/cookbook_loader.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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 |