summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md4
-rw-r--r--Gemfile.lock2
-rw-r--r--lib/license/finder/ext/bundler.rb2
-rw-r--r--lib/license/management/version.rb2
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