diff options
| author | John Keiser <jkeiser@opscode.com> | 2014-09-05 17:12:47 -0700 |
|---|---|---|
| committer | John Keiser <jkeiser@opscode.com> | 2014-09-05 17:12:47 -0700 |
| commit | c8b1e30a8b558c29a1ce1cc6a5a1e5de56534d22 (patch) | |
| tree | 36e3eb5bcc258adfad66daef145180e93702bed4 /lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_dir.rb | |
| parent | ad0bfd815f24938acaf9d4627c31dee8a3642583 (diff) | |
| download | chef-c8b1e30a8b558c29a1ce1cc6a5a1e5de56534d22.tar.gz | |
Make Chef::Config.versioned_cookbooks configurable by consumersjk/versioned_cookbooks_config
without having to modify Chef::Config itself
Diffstat (limited to 'lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_dir.rb')
| -rw-r--r-- | lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_dir.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_dir.rb b/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_dir.rb index b151db6973..20a3f4e2be 100644 --- a/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_dir.rb @@ -35,7 +35,7 @@ class Chef loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, parent.chefignore) # We need the canonical cookbook name if we are using versioned cookbooks, but we don't # want to spend a lot of time adding code to the main Chef libraries - if Chef::Config[:versioned_cookbooks] + if root.versioned_cookbooks _canonical_name = canonical_cookbook_name(File.basename(file_path)) fail "When versioned_cookbooks mode is on, cookbook #{file_path} must match format <cookbook_name>-x.y.z" unless _canonical_name |