summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Di Marco <rob@elocal.com>2016-06-20 12:38:59 -0400
committerRob Di Marco <rob@elocal.com>2016-06-20 12:38:59 -0400
commitf09658f66b403ace0c8236585172cb7a691cc698 (patch)
tree7c8f5c7a6782c873c014295095b652c03faf314d
parentde78e3902a6b1743f0d69bbac073c274ed85cb80 (diff)
downloadchef-f09658f66b403ace0c8236585172cb7a691cc698.tar.gz
Fix for #5027 - Remove bad variable reference
A previous change introduced what appears to be a copy/paste bug. A guard condition from the children method was used in the make_child_entry incorrectly. This removes the reference to the non-existent variable `seen`
-rw-r--r--lib/chef/chef_fs/file_system/multiplexed_dir.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/chef_fs/file_system/multiplexed_dir.rb b/lib/chef/chef_fs/file_system/multiplexed_dir.rb
index d3951edd51..21abc012f8 100644
--- a/lib/chef/chef_fs/file_system/multiplexed_dir.rb
+++ b/lib/chef/chef_fs/file_system/multiplexed_dir.rb
@@ -41,7 +41,7 @@ class Chef
child_entry = dir.child(name)
if child_entry.exists?
if result
- Chef::Log.debug("Child with name '#{child_entry.name}' found in multiple directories: #{result.parent.path_for_printing} and #{child_entry.parent.path_for_printing}") unless seen[child.name].path_for_printing == child.path_for_printing
+ Chef::Log.debug("Child with name '#{child_entry.name}' found in multiple directories: #{result.parent.path_for_printing} and #{child_entry.parent.path_for_printing}")
else
result = child_entry
end