Skip to content

Commit 8758c56

Browse files
committed
(MAINT) Remove unnecessary require
Due to some issues in the way that Puppet loads code, and some differences in how that works in JRuby vs MRI Ruby, doing a `require` on the `puppet/type/file` code multiple times in a single JRuby interpreter will cause problems. Since this code automatically gets loaded by Puppet before any custom type/provider is loaded, the `require` statement is unnecessary. This is related to the following Puppet Jira tickets: https://tickets.puppetlabs.com/browse/SERVER-64 https://tickets.puppetlabs.com/browse/SERVER-40 and also to the following puppet-logstash PR: voxpupuli/puppet-logstash#196 Hopefully there will be a more permanent fix in JRuby at some point: jruby/jruby#2477 But in the meantime, this simple workaround makes `file_concat` compatible with Puppet Server.
1 parent e37437f commit 8758c56

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

lib/puppet/type/file_concat.rb

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require 'puppet/type/file'
21
require 'puppet/type/file/owner'
32
require 'puppet/type/file/group'
43
require 'puppet/type/file/mode'

0 commit comments

Comments
 (0)