File tree Expand file tree Collapse file tree 1 file changed +1
-5
lines changed
lib/octocatalog-diff/util Expand file tree Collapse file tree 1 file changed +1
-5
lines changed Original file line number Diff line number Diff line change 2
2
3
3
# Helper to determine the version of Puppet
4
4
5
- require 'logger'
6
- require 'stringio'
7
5
require_relative 'scriptrunner'
8
6
9
7
module OctocatalogDiff
@@ -18,17 +16,15 @@ def self.puppet_version(puppet, options = {})
18
16
raise ArgumentError , 'Puppet binary was not supplied' if puppet . nil?
19
17
raise Errno ::ENOENT , "Puppet binary #{ puppet } doesn't exist" unless File . file? ( puppet )
20
18
21
- logger = options [ :logger ] || Logger . new ( StringIO . new )
22
-
23
19
sr_opts = {
24
- logger : logger ,
25
20
default_script : 'puppet/puppet.sh' ,
26
21
override_script_path : options [ :override_script_path ]
27
22
}
28
23
29
24
script = OctocatalogDiff ::Util ::ScriptRunner . new ( sr_opts )
30
25
31
26
sr_run_opts = {
27
+ :logger => options [ :logger ] ,
32
28
:working_dir => File . dirname ( puppet ) ,
33
29
:pass_env_vars => options [ :pass_env_vars ] ,
34
30
:argv => '--version' ,
You can’t perform that action at this time.
0 commit comments