Please review pull request #11: Rubygems is not required to use hiera opened by (hunner)
Description:
Hiera may be used if the hiera libs are sync'd from a puppet module via
pluginsync, even without rubygems
- Opened: Wed Nov 23 02:09:11 UTC 2011
- Based on: puppetlabs:master (5abdb9ec923f3b6696e9743728e631c5d380328d)
- Requested merge: hunner:bug/master/rubygems_unnecessary (57463a62d5a076efe0408c6da83cba8d4336d856)
Diff follows:
diff --git a/lib/puppet/parser/functions/hiera.rb b/lib/puppet/parser/functions/hiera.rb
index d08b238..ed5404f 100644
--- a/lib/puppet/parser/functions/hiera.rb
+++ b/lib/puppet/parser/functions/hiera.rb
@@ -20,7 +20,6 @@ module Puppet::Parser::Functions
configfile = File.join([File.dirname(Puppet.settings[:config]), "hiera.yaml"])
raise(Puppet::ParseError, "Hiera config file #{configfile} not readable") unless File.exist?(configfile)
- raise(Puppet::ParseError, "You need rubygems to use Hiera") unless Puppet.features.rubygems?
require 'hiera'
require 'hiera/scope'
diff --git a/lib/puppet/parser/functions/hiera_array.rb b/lib/puppet/parser/functions/hiera_array.rb
index c0c4a87..31db5c9 100644
--- a/lib/puppet/parser/functions/hiera_array.rb
+++ b/lib/puppet/parser/functions/hiera_array.rb
@@ -11,7 +11,6 @@ module Puppet::Parser::Functions
configfile = File.join([File.dirname(Puppet.settings[:config]), "hiera.yaml"])
raise(Puppet::ParseError, "Hiera config file #{configfile} not readable") unless File.exist?(configfile)
- raise(Puppet::ParseError, "You need rubygems to use Hiera") unless Puppet.features.rubygems?
require 'hiera'
require 'hiera/scope'
diff --git a/lib/puppet/parser/functions/hiera_hash.rb b/lib/puppet/parser/functions/hiera_hash.rb
index 5d49d59..98ef52a 100644
--- a/lib/puppet/parser/functions/hiera_hash.rb
+++ b/lib/puppet/parser/functions/hiera_hash.rb
@@ -11,7 +11,6 @@ module Puppet::Parser::Functions
configfile = File.join([File.dirname(Puppet.settings[:config]), "hiera.yaml"])
raise(Puppet::ParseError, "Hiera config file #{configfile} not readable") unless File.exist?(configfile)
- raise(Puppet::ParseError, "You need rubygems to use Hiera") unless Puppet.features.rubygems?
require 'hiera'
require 'hiera/scope'
diff --git a/lib/puppet/parser/functions/hiera_include.rb b/lib/puppet/parser/functions/hiera_include.rb
index 12e42f6..3f53786 100644
--- a/lib/puppet/parser/functions/hiera_include.rb
+++ b/lib/puppet/parser/functions/hiera_include.rb
@@ -11,7 +11,6 @@ module Puppet::Parser::Functions
configfile = File.join([File.dirname(Puppet.settings[:config]), "hiera.yaml"])
raise(Puppet::ParseError, "Hiera config file #{configfile} not readable") unless File.exist?(configfile)
- raise(Puppet::ParseError, "You need rubygems to use Hiera") unless Puppet.features.rubygems?
require 'hiera'
require 'hiera/scope'
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
