ohai 15.7.3 → 15.7.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/ohai/common/dmi.rb +2 -2
- data/lib/ohai/plugins/solaris2/dmi.rb +2 -2
- data/lib/ohai/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3836d8ca7e3ae0f1beb6a8f4cd3ca01cc016b8803d01d7ff2aca39dd3622cdc1
|
4
|
+
data.tar.gz: c09ced6abcc3ee95ddb69f35a08f34291bbc7b8b9f4e855fd809e88f7fae5eed
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a8d390efe3e82e70e744249ef71e9087898c2dc1f6fcb76b08797d5079d8138a2c56fc11189ad785b6b8057dc1679ae4c2fa97318d6239a4dc4c286d01a483e5
|
7
|
+
data.tar.gz: 5a513712ac8a5173b2a31ce39b80777f6e7c08bab22d5e8642c906c2cad1545ecc5d4ea1702c04624bfcbf8f0ebdbe92be73f7efd01ab1c2da671601cbf9508b
|
data/lib/ohai/common/dmi.rb
CHANGED
@@ -117,12 +117,12 @@ module Ohai
|
|
117
117
|
def convenience_keys(dmi)
|
118
118
|
dmi.each do |type, records|
|
119
119
|
in_common = Mash.new
|
120
|
-
next unless records.
|
120
|
+
next unless records.is_a?(Mash)
|
121
121
|
next unless records.key?("all_records")
|
122
122
|
|
123
123
|
records[:all_records].each do |record|
|
124
124
|
record.each do |field, value|
|
125
|
-
next if value.
|
125
|
+
next if value.is_a?(Mash)
|
126
126
|
next if field.to_s == "application_identifier"
|
127
127
|
next if field.to_s == "size"
|
128
128
|
next if field.to_s == "record_id"
|
@@ -24,7 +24,7 @@ Ohai.plugin(:DMI) do
|
|
24
24
|
|
25
25
|
# if we already have a "dmi" with keys (presumably from dmidecode), don't try smbios
|
26
26
|
# note that a single key just means dmidecode exited with its version
|
27
|
-
if
|
27
|
+
if dmi.is_a?(Mash) && dmi.keys.length > 1
|
28
28
|
logger.trace("Plugin DMI: skipping smbios output, since DMI information has already been provided")
|
29
29
|
return
|
30
30
|
end
|
@@ -177,7 +177,7 @@ Ohai.plugin(:DMI) do
|
|
177
177
|
next
|
178
178
|
end
|
179
179
|
# overwrite "raw" value with a new Mash
|
180
|
-
dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field] = Mash.new unless dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field].
|
180
|
+
dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field] = Mash.new unless dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field].is_a?(Mash)
|
181
181
|
dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field][extended_data[1]] = extended_data[2]
|
182
182
|
|
183
183
|
else
|
data/lib/ohai/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ohai
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 15.7.
|
4
|
+
version: 15.7.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Adam Jacob
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2020-01-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: systemu
|