Skip to content

Commit b0f79fd

Browse files
authored
Merge pull request #66 from ekohl/fix-solaris-processors
Fix Solaris processors regex
2 parents 9a60cd9 + fa7c622 commit b0f79fd

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

lib/facter/resolvers/solaris/processors.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ def collect_kstat_info(fact_name)
2626
def parse_output(output)
2727
@fact_list[:logical_count] = output.scan(/module/).size
2828
@fact_list[:physical_count] = output.scan(/chip_id .*/).uniq.size
29-
@fact_list[:speed] = output.scan(/current_clock_Hz .*/).first.gsub(/[a-zA-z\s]+/, '').to_i
29+
# .scan(//current_clock_Hz\s+(\d+)/) returns [['123']] (or [['123'], ['456']] if there are more matches)
30+
@fact_list[:speed] = output.scan(/current_clock_Hz\s+(\d+)/).first&.first&.to_i
3031
@fact_list[:models] = output.scan(/brand .*/).map { |elem| elem.gsub(/brand(\s+)/, '') }
3132
calculate_threads_cores(output)
3233
end

0 commit comments

Comments
 (0)