summaryrefslogtreecommitdiff
path: root/lib/chef/cookbook
diff options
context:
space:
mode:
authordanielsdeleo <dan@getchef.com>2014-08-05 15:01:14 -0700
committerdanielsdeleo <dan@getchef.com>2014-08-12 11:03:09 -0700
commit7545eda303bbb6034a0a2397e1a510b19bdd5e9b (patch)
tree3746156e8b704b7a0cb5560ada6bc3b0e27a39a8 /lib/chef/cookbook
parentf5ea885549b840cbb9008f739d1f6f1784e06f97 (diff)
downloadchef-7545eda303bbb6034a0a2397e1a510b19bdd5e9b.tar.gz
Remove assumption that cookbook names match dirnames in CookbookLoader
Cookbooks are now loaded with a "preload" step that reads cookbook metadata to determine the name. Cookbooks are fully loaded later.
Diffstat (limited to 'lib/chef/cookbook')
-rw-r--r--lib/chef/cookbook/cookbook_version_loader.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/chef/cookbook/cookbook_version_loader.rb b/lib/chef/cookbook/cookbook_version_loader.rb
index bff17dc4a4..750d886e84 100644
--- a/lib/chef/cookbook/cookbook_version_loader.rb
+++ b/lib/chef/cookbook/cookbook_version_loader.rb
@@ -24,6 +24,9 @@ class Chef
attr_reader :frozen
attr_reader :uploaded_cookbook_version_file
+ # TODO: use this in preference to @cookbook_path internally
+ attr_reader :cookbook_path
+
def initialize(path, chefignore=nil)
@cookbook_path = File.expand_path( path ) # cookbook_path from which this was loaded
# We keep a list of all cookbook paths that have been merged in