diff options
| author | Noah Kantrowitz <noah@coderanger.net> | 2013-09-18 21:02:20 -0700 |
|---|---|---|
| committer | Noah Kantrowitz <noah@coderanger.net> | 2014-10-04 12:06:56 -0700 |
| commit | 3b207090758210193df0502e988068f56d7c2b37 (patch) | |
| tree | 380314ecf06240007ef1cfff006f9d5f3cfcada8 /lib/chef/resource/cookbook_file.rb | |
| parent | 2fa97c49f25e16c88373e2d084d8bacd46679bd9 (diff) | |
| download | chef-3b207090758210193df0502e988068f56d7c2b37.tar.gz | |
Rework template/file loading to not require the default/ and to accept an array for explicit search path manipulation. This is the backwards compatible solution to migrate away from the implicit search path in favor of making it explicit when needed (which is rarely).
Conflicts:
lib/chef/cookbook_version.rb
Diffstat (limited to 'lib/chef/resource/cookbook_file.rb')
| -rw-r--r-- | lib/chef/resource/cookbook_file.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/resource/cookbook_file.rb b/lib/chef/resource/cookbook_file.rb index de758aef71..2709cf64f4 100644 --- a/lib/chef/resource/cookbook_file.rb +++ b/lib/chef/resource/cookbook_file.rb @@ -40,7 +40,7 @@ class Chef end def source(source_filename=nil) - set_or_return(:source, source_filename, :kind_of => String) + set_or_return(:source, source_filename, :kind_of => [ String, Array ]) end def cookbook(cookbook_name=nil) |