summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorJacob Helwig <jacob@puppetlabs.com>2011-05-03 14:53:03 -0700
committerJacob Helwig <jacob@puppetlabs.com>2011-05-03 15:24:06 -0700
commit5569fad994978224dd24df9974ed731a409d11de (patch)
treeebbc45317aea603dd9f587955b7c2ac60e7bd253 /lib/puppet
parentb17b49c97380cd64e75ac5e2ef12fb939ae953bb (diff)
downloadpuppet-5569fad994978224dd24df9974ed731a409d11de.tar.gz
puppet-5569fad994978224dd24df9974ed731a409d11de.tar.xz
puppet-5569fad994978224dd24df9974ed731a409d11de.zip
(#7117) Return the environment as a Puppet::Node::Environment in uri2indirection
The environment returned by uri2indirection used to be a Puppet::Node::Environment. When this changed to simply being the string of the environment name, this broke assumptions made in other areas of the code. Paired-with: Nick Lewis <nick@puppetlabs.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/network/http/api/v1.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/network/http/api/v1.rb b/lib/puppet/network/http/api/v1.rb
index 61307f01e..388d54961 100644
--- a/lib/puppet/network/http/api/v1.rb
+++ b/lib/puppet/network/http/api/v1.rb
@@ -30,7 +30,7 @@ module Puppet::Network::HTTP::API::V1
method = indirection_method(http_method, indirection)
- params[:environment] = environment
+ params[:environment] = Puppet::Node::Environment.new(environment)
raise ArgumentError, "No request key specified in #{uri}" if key == "" or key.nil?