# File lib/puppet/rails/host.rb, line 247 247: def perform_resource_merger(compiled, resources) 248: return compiled.values if resources.empty? 249: 250: # Now for all resources in the catalog but not in the db, we're pretty easy. 251: additions = [] 252: compiled.each do |ref, resource| 253: if db_resource = resources[ref] 254: db_resource.merge_parser_resource(resource) 255: else 256: additions << resource 257: end 258: end 259: log_accumulated_marks "Resource merger" 260: 261: return additions 262: end