From 058266feebb3be90f6af29d0ff70b22ceeb9b3e7 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Wed, 18 Feb 2009 12:16:39 -0600 Subject: Switching the ModuleFiles Indirection terminus to the new Module/Env api Again, much cleaner and simpler. Signed-off-by: Luke Kanies --- lib/puppet/indirector/module_files.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/puppet/indirector/module_files.rb b/lib/puppet/indirector/module_files.rb index 7c5cf278f..fbf40aa70 100644 --- a/lib/puppet/indirector/module_files.rb +++ b/lib/puppet/indirector/module_files.rb @@ -37,7 +37,7 @@ class Puppet::Indirector::ModuleFiles < Puppet::Indirector::Terminus # Try to find our module. def find_module(module_name, node_name) - Puppet::Module::find(module_name, environment(node_name)) + environment(node_name).module(module_name) end # Search for a list of files. @@ -56,9 +56,9 @@ class Puppet::Indirector::ModuleFiles < Puppet::Indirector::Terminus # Determine the environment to use, if any. def environment(node_name) if node_name and node = Puppet::Node.find(node_name) - node.environment + Puppet::Node::Environment.new(node.environment) else - Puppet::Node::Environment.new.name + Puppet::Node::Environment.new end end -- cgit