Make root_dir required for CookbookVersion to generate manifest

2 files changed, 8 insertions, 2 deletions

diff --git a/lib/chef/chef_fs/chef_fs_data_store.rb b/lib/chef/chef_fs/chef_fs_data_store.rb
index 28f0af4695..b84fc1945d 100644
--- a/lib/chef/chef_fs/chef_fs_data_store.rb
+++ b/lib/chef/chef_fs/chef_fs_data_store.rb
@@ -24,6 +24,7 @@ require 'chef/chef_fs/file_system'
 require 'chef/chef_fs/file_system/not_found_error'
 require 'chef/chef_fs/file_system/memory_root'
 require 'fileutils'
+
 class Chef
   module ChefFS
     class ChefFSDataStore
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 629c1d9acb..b151db6973 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
@@ -44,12 +44,17 @@ class Chef
             end
 
             loader.load_cookbooks
-            return loader.cookbook_version
+            cb = loader.cookbook_version
+            if !cb
+              Chef::Log.error("Cookbook #{file_path} empty.")
+              raise "Cookbook #{file_path} empty."
+            end
+            cb
           rescue => e
             Chef::Log.error("Could not read #{path_for_printing} into a Chef object: #{e}")
             Chef::Log.error(e.backtrace.join("\n"))
+            raise
           end
-          nil
         end
 
         def children