Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2025-02-17 06:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix build issue

Browse source 
Signed-off-by: Nikita Mathur <nikita.mathur@chef.io>
This commit is contained in:
Nikita Mathur 2022-06-09 11:54:52 +05:30 • committed by Clinton Wolfe
parent 4c753f9d84
commit 07fe5d4105
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/inspec/dependencies/dependency_set.rb
View file

@ -25,7 +25,7 @@ module Inspec
def self.from_array(dependencies, cwd, cache, backend)
dep_list = {}
dependencies.each do |d|
key_name = "#{d.name}-#{d.source_version}"
key_name = (d.source_version ? "#{d.name}-#{d.source_version}" : d.name) rescue d.name
dep_list[key_name] = d
end
new(cwd, cache, dep_list, backend)
@ -40,7 +40,7 @@ module Inspec
def self.flatten_dep_tree(dep_tree)
dep_list = {}
dep_tree.each do |d|
key_name = "#{d.name}-#{d.source_version}"
key_name = (d.source_version ? "#{d.name}-#{d.source_version}" : d.name) rescue d.name
dep_list[key_name] = d
dep_list.merge!(flatten_dep_tree(d.dependencies))
end

3
lib/inspec/dsl.rb
View file

@ -87,9 +87,8 @@ module Inspec::DSL
profile_id_key.pop
new_profile_id = key if profile_id_key.join("-") == profile_id
end
profile_id = new_profile_id
end
dep_entry = dependencies.list[profile_id]
dep_entry = new_profile_id ? dependencies.list[new_profile_id] : dependencies.list[profile_id]
if dep_entry.nil?
raise <<~EOF