From d5bbc7f91932c6e17b8887b4fa9f76438575eaf3 Mon Sep 17 00:00:00 2001 From: jordanbreen28 Date: Fri, 25 Nov 2022 13:44:25 +0000 Subject: [PATCH] (538) - Unresolved fact fix Prior to this commit, when run on non-darwin systems with no java installed, the custom fact java_version was unresolved. This was due to an incorrect return type set in lib/facter/java_version.rb (returned a boolean). This commit hopes to rectify this issue, by ensuring that the returned value for java_version is in the correct format. --- lib/facter/java_version.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/facter/java_version.rb b/lib/facter/java_version.rb index b1b5e0ae..0029cb54 100644 --- a/lib/facter/java_version.rb +++ b/lib/facter/java_version.rb @@ -16,9 +16,9 @@ Facter.add(:java_version) do setcode do if ['darwin'].include? Facter.value(:kernel).downcase - return unless Facter::Core::Execution.execute('/usr/libexec/java_home --failfast', { on_fail: false }) + return nil unless Facter::Core::Execution.execute('/usr/libexec/java_home --failfast', { on_fail: false }) else - return unless Facter::Core::Execution.which('java') + return nil unless Facter::Core::Execution.which('java') end version = Facter::Core::Execution.execute('java -Xmx12m -version 2>&1').lines.find { |line| line.include?('version') } version[%r{\"(.*?)\"}, 1] if version