Merge pull request #771 from rabbitmq/lrb-fix-processing-fetch-deps

Fixup the dependency line matching
pivotal · Jul 31, 2020 · 4fb5ba4 · 4fb5ba4
2 parents 73aaabb + 75b7696
commit 4fb5ba4
Show file tree

Hide file tree

Showing 2 changed files with 2,205 additions and 354 deletions.
diff --git a/lib/license_finder/package_managers/erlangmk.rb b/lib/license_finder/package_managers/erlangmk.rb
@@ -34,7 +34,10 @@ def deps
       stdout, stderr, status = Cmd.run(command)
       raise "Command '#{command}' failed to execute: #{stderr}" unless status.success?
 
-      stdout.each_line.map(&:strip).reject { |line| line.start_with?('make') }
+      dep_re = Regexp.new('^\s*DEP')
+      line_re = Regexp.new('^[_a-z0-9]+:')
+
+      stdout.each_line.map(&:strip).select { |line| !(line.start_with?('make') || line =~ dep_re) && line =~ line_re }
     end
   end
 end