From: Bastian Blank <waldi@debian.org>
Date: Tue, 11 Apr 2017 18:30:52 +0000 (+0200)
Subject: Drop explicit function requires
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6b536ac623ca0c5c04d6befb2618095130dc10c8;p=mirror%2Fdsa-puppet.git

Drop explicit function requires
---

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb b/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
index 4d091008f..fe7606b40 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
@@ -1,7 +1,6 @@
 module Puppet::Parser::Functions
   newfunction(:entropy_provider, :type => :rvalue) do |args|
     begin
-      require '/var/lib/puppet/lib/puppet/parser/functions/whohosts.rb'
       require 'digest/sha1'
 
       fqdn = args[0]
diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index 0695fdf9c..6df930136 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -3,10 +3,6 @@ module Puppet::Parser::Functions
     host = args[0]
     yamlfile = args[1]
     begin
-
-      require '/var/lib/puppet/lib/puppet/parser/functions/ldapinfo.rb'
-      require '/var/lib/puppet/lib/puppet/parser/functions/whohosts.rb'
-
       nodeinfo         = function_yamlinfo([host, yamlfile])
       nodeinfo['ldap'] = function_ldapinfo([host, '*'])
       unless nodeinfo['ldap']['ipHostNumber']