1 files changed, 6 insertions, 1 deletions
diff --git a/lib/chef/chef_fs/file_system/chef_server_root_dir.rb b/lib/chef/chef_fs/file_system/chef_server_root_dir.rb
index 824325f31b..e3ffd644ad 100644
--- a/lib/chef/chef_fs/file_system/chef_server_root_dir.rb
+++ b/lib/chef/chef_fs/file_system/chef_server_root_dir.rb
@@ -110,7 +110,8 @@ class Chef
         end
 
         def can_have_child?(name, is_dir)
-          is_dir && children.any? { |child| child.name == name }
+          result = children.select { |child| child.name == name }.first
+          result && !!result.dir? == !!is_dir
         end
 
         def org
@@ -124,6 +125,10 @@ class Chef
           end
         end
 
+        def make_child_entry(name)
+          children.select { |child| child.name == name }.first
+        end
+
         def children
           @children ||= begin
             result = [