diff options
| author | mo khan <mo.khan@gmail.com> | 2020-07-11 17:14:56 -0600 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-07-11 17:14:56 -0600 |
| commit | d8b18764499ed0378d5f5caf0d68460c39510cfe (patch) | |
| tree | c0a9e8021e38e702a0b02d99993e639f86498ea1 | |
| parent | a48b0c8fdfae4ff0447f7a232fe3c39bca7ec8a9 (diff) | |
Return empty list when bundler scan failsv3.17.2
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | lib/license/finder/ext/bundler.rb | 2 | ||||
| -rw-r--r-- | lib/license/management/version.rb | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0314844..8892241 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # GitLab License management changelog +## v3.17.2 + +- Return empty list of packages if bundler scanner fails. (!181) + ## v3.17.1 - Reset bundler config from within sub directories in project (!188) diff --git a/Gemfile.lock b/Gemfile.lock index ca6e615..3435ee7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ GIT PATH remote: . specs: - license-management (3.17.1) + license-management (3.17.2) license_finder (~> 6.6.0) GEM diff --git a/lib/license/finder/ext/bundler.rb b/lib/license/finder/ext/bundler.rb index a5fe21d..a40a698 100644 --- a/lib/license/finder/ext/bundler.rb +++ b/lib/license/finder/ext/bundler.rb @@ -17,7 +17,7 @@ module LicenseFinder def current_packages with_clean_bundler do stdout, _stderr, status = shell.execute(scan_command, env: default_env) - return super unless status.success? + return [] unless status.success? stdout.each_line.map do |line| map_from(JSON.parse(line, symbolize_names: true)) diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index 880ca6c..76b9238 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '3.17.1' + VERSION = '3.17.2' end end |