diff options
| author | mo khan <mo.khan@gmail.com> | 2020-03-31 16:35:33 +0000 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-03-31 16:35:33 +0000 |
| commit | fec5e888a10f6d6c0a64d17242d293fc9da6d3d2 (patch) | |
| tree | 92e14683798648106e573555ed4a97658dfb7122 /lib/license/management/report | |
| parent | d0ff10b6ae1075a13827e00dd0120fac9639fde8 (diff) | |
| parent | 67e1de7e57a843622a824f68e4ffb40d8b9ff320 (diff) | |
Merge branch '199059-setup-py' into 'master'v3.3.0
Use virtualenv and pip-licenses to scan python projects
See merge request gitlab-org/security-products/license-management!128
Diffstat (limited to 'lib/license/management/report')
| -rw-r--r-- | lib/license/management/report/v1.rb | 2 | ||||
| -rw-r--r-- | lib/license/management/report/v2.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/license/management/report/v1.rb b/lib/license/management/report/v1.rb index 49423c6..27495b5 100644 --- a/lib/license/management/report/v1.rb +++ b/lib/license/management/report/v1.rb @@ -31,7 +31,7 @@ module License license = { name: join_license_names(dependency.licenses) } urls = dependency.licenses.map(&:url).reject { |x| blank?(x) }.uniq.sort - log_info("multiple urls detected: #{urls.inspect}") if urls.size > 1 + logger.info("multiple urls detected: #{urls.inspect}") if urls.size > 1 url = urls[0] || license_data(dependency.licenses.first)['url'] license[:url] = url if present?(url) diff --git a/lib/license/management/report/v2.rb b/lib/license/management/report/v2.rb index 6ab6b99..f8c96da 100644 --- a/lib/license/management/report/v2.rb +++ b/lib/license/management/report/v2.rb @@ -31,7 +31,7 @@ module License def map_from(dependency) licenses = dependency.licenses.map { |license| data_for(license)['id'] }.sort - log_info [dependency.name, dependency.version, licenses].inspect + logger.info [dependency.name, dependency.version, licenses].inspect { name: dependency.name, |