lib/berkshelf/lockfile.rb in berkshelf-3.1.1 vs lib/berkshelf/lockfile.rb in berkshelf-3.1.2
- old
+ new
@@ -172,16 +172,16 @@
unless Semverse::Constraint.new(constraint).satisfies?(graphed.version)
Berkshelf.log.debug "#{indent} Version constraint is not satisfied"
return false
end
+ checked[name] = true
+
unless satisfies_transitive?(graphed, checked, level + 2)
Berkshelf.log.debug "#{indent} Transitive are not satisifed"
return false
end
-
- checked[name] = true
end
end
# Resolve this Berksfile and apply the locks found in the generated
# +Berksfile.lock+ to the target Chef environment
@@ -721,10 +721,10 @@
def update(cookbooks)
@graph = {}
cookbooks.each do |cookbook|
@graph[cookbook.cookbook_name.to_s] = GraphItem.new(
- cookbook.name,
+ cookbook.cookbook_name,
cookbook.version,
cookbook.dependencies,
)
end
end