diff options
| author | Luke Kanies <luke@reductivelabs.com> | 2010-01-27 10:19:09 -0800 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 744295d1058e640b778bdac39202c97adbc59c9f (patch) | |
| tree | d565a88142156338e90dcf24acf71840585f4362 /lib/puppet/node | |
| parent | 4f907c66ab3ee973323ef8a14bc5192bcc78967b (diff) | |
| download | puppet-744295d1058e640b778bdac39202c97adbc59c9f.tar.gz puppet-744295d1058e640b778bdac39202c97adbc59c9f.tar.xz puppet-744295d1058e640b778bdac39202c97adbc59c9f.zip | |
Allowing Environment.new to take an environment
This can happen because we're almost always converting
to environment instances from strings.
Shouldn't happen often, but it's easier to be more failure-tolerant.
Signed-off-by: Luke Kanies <luke@reductivelabs.com>
Diffstat (limited to 'lib/puppet/node')
| -rw-r--r-- | lib/puppet/node/environment.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/node/environment.rb b/lib/puppet/node/environment.rb index 70417449e..d1a126aaa 100644 --- a/lib/puppet/node/environment.rb +++ b/lib/puppet/node/environment.rb @@ -27,6 +27,7 @@ class Puppet::Node::Environment # Return an existing environment instance, or create a new one. def self.new(name = nil) + return name if name.is_a?(self) name ||= Puppet.settings.value(:environment) raise ArgumentError, "Environment name must be specified" unless name |