summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-02-23 08:41:24 +1100
committerJames Turnbull <james@lovedthanlost.net>2008-02-23 08:41:24 +1100
commit5d35bc5904a09bc07a11039500c59021bafaee7e (patch)
tree5d0980bfb8ce1a2d9d5e244046846617a040a3cb /lib
parent7976015389149defd7f135a859ab11b94e6aad11 (diff)
downloadpuppet-5d35bc5904a09bc07a11039500c59021bafaee7e.tar.gz
puppet-5d35bc5904a09bc07a11039500c59021bafaee7e.tar.xz
puppet-5d35bc5904a09bc07a11039500c59021bafaee7e.zip
Fixes #1078 and includes new test
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/network/client/master.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb
index 6d1a0235f..390f3d4e2 100644
--- a/lib/puppet/network/client/master.rb
+++ b/lib/puppet/network/client/master.rb
@@ -40,8 +40,10 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
facts["clientversion"] = Puppet.version.to_s
# And add our environment as a fact.
- facts["environment"] = Puppet[:environment]
-
+ unless facts.include?("environment")
+ facts["environment"] = Puppet[:environment]
+ end
+
facts
end