diff options
| author | Luke Kanies <luke@madstop.com> | 2007-11-20 01:08:34 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-11-20 01:08:34 -0600 |
| commit | 8cc07adda20b4e63bbad5b2759303d00d215341c (patch) | |
| tree | e8157ba56cabb51ba67d9eb8d355a40ef4e96c4c /lib/puppet/indirector/module_files.rb | |
| parent | 53008e567fd64f391e0b45652b2f4ac1551ccf47 (diff) | |
| download | puppet-8cc07adda20b4e63bbad5b2759303d00d215341c.tar.gz puppet-8cc07adda20b4e63bbad5b2759303d00d215341c.tar.xz puppet-8cc07adda20b4e63bbad5b2759303d00d215341c.zip | |
Using the Environment class to determine the default environment,
rather than plenty of different places having the logic of how
to determine the default environment.
Diffstat (limited to 'lib/puppet/indirector/module_files.rb')
| -rw-r--r-- | lib/puppet/indirector/module_files.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/puppet/indirector/module_files.rb b/lib/puppet/indirector/module_files.rb index c79fae57b..84286d8a5 100644 --- a/lib/puppet/indirector/module_files.rb +++ b/lib/puppet/indirector/module_files.rb @@ -57,10 +57,8 @@ class Puppet::Indirector::ModuleFiles < Puppet::Indirector::Terminus def environment(node_name) if node_name and node = Puppet::Node.find(node_name) node.environment - elsif env = Puppet.settings[:environment] and env != "" - env else - nil + Puppet::Node::Environment.new.name end end |