facter 4.2.9 → 4.2.10

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c1f5a8cf03ae84a5ed4d4c960fe36d5f99cee36fee108af8e093c841149e6b2b
4
- data.tar.gz: 40e0d6da9df3b0a6a9bd862c4beb3059e1bd5b24b6e779330afe965b13f9d05d
3
+ metadata.gz: 72df8d4e967960151a122eb609784efda469ec7eeffd57fcd0ccac160b8e0fcd
4
+ data.tar.gz: 57f7131294d62d0fa7a36d49e5f722f78aea2d9f9400720d651d896347ec8f67
5
5
  SHA512:
6
- metadata.gz: a269678bb8f2c68be05c0ca761eb7a933f9a0651768408d0db7d07e2e80d43ce5bdc98cacc050935fdb3c4f31058711b8c619d73f7df657cb79eae0f34e900e2
7
- data.tar.gz: 9ff5b843060429d560e4ed3dcaf4add5424d25d1cceabf31e67981161f4f25a68f7f9a4414087cc3a97aac247f5d1d62524b68413d91e222bb9694257c2d0b2f
6
+ metadata.gz: ef543fee67eeff6371587b5c16fc1cb4dfbfee9647a41bb844ca0554111de6499dab5bf16fe3a8e3025489c6ebcfd88f9ccc3ffe2b14f514897066740bb979c6
7
+ data.tar.gz: 33fbe62bc7d09ed9c8f564f4727a7058c94439eeeb69396be5209d28656d6b4d34577eb271c62c9f93de38b585cab805de56b8d2e7971fca28d6121c6cae9a6c
@@ -227,7 +227,7 @@ cache_format_version is incorrect!")
227
227
 
228
228
  begin
229
229
  File.delete(cache_file_name) if File.readable?(cache_file_name)
230
- rescue Errno::EACCES => e
230
+ rescue Errno::EACCES, Errno::EROFS => e
231
231
  @log.warn("Could not delete cache: #{e.message}")
232
232
  end
233
233
  end
@@ -34,11 +34,13 @@ module Facter
34
34
  end
35
35
 
36
36
  def determine_other(output)
37
- other_vm = output.split("\n").first
37
+ values = output.split("\n")
38
+ other_vm = values.first
38
39
  return unless other_vm
39
40
 
40
41
  return 'zlinux' if other_vm =~ /ibm_systemz/
41
42
  return retrieve_vserver if other_vm =~ /linux_vserver/
43
+ return (values - ['redhat']).first if values.include?('redhat')
42
44
 
43
45
  other_vm
44
46
  end
@@ -14,7 +14,7 @@ module Facter
14
14
  kernel_version = input[:kernel_version]
15
15
 
16
16
  if version =~ /10.0/
17
- check_version_10(consumerrel, kernel_version)
17
+ check_version_10_11(consumerrel, kernel_version)
18
18
  else
19
19
  check_version_6(version, consumerrel) || check_version_5(version, consumerrel, description) || version
20
20
  end
@@ -22,10 +22,12 @@ module Facter
22
22
 
23
23
  private
24
24
 
25
- def check_version_10(consumerrel, kernel_version)
25
+ def check_version_10_11(consumerrel, kernel_version)
26
+ build_number = kernel_version[/([^.]*)$/].to_i
27
+
28
+ return '11' if build_number >= 22_000
26
29
  return '10' if consumerrel
27
30
 
28
- build_number = kernel_version[/([^.]*)$/].to_i
29
31
  if build_number >= 20_348
30
32
  '2022'
31
33
  elsif build_number >= 17_623
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Facter
4
- VERSION = '4.2.9' unless defined?(VERSION)
4
+ VERSION = '4.2.10' unless defined?(VERSION)
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: facter
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.9
4
+ version: 4.2.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppet
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-04-04 00:00:00.000000000 Z
11
+ date: 2022-05-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -1094,7 +1094,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1094
1094
  - !ruby/object:Gem::Version
1095
1095
  version: '0'
1096
1096
  requirements: []
1097
- rubygems_version: 3.0.9
1097
+ rubygems_version: 3.1.6
1098
1098
  signing_key:
1099
1099
  specification_version: 4
1100
1100
  summary: Facter, a system inventory tool