summaryrefslogtreecommitdiff
path: root/lib/license/management/shell.rb
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-06-04 08:53:19 +0000
committerCan Eldem <celdem@gitlab.com>2020-06-04 08:53:19 +0000
commit834d7a4fdf3fd295386e4b12a31de81507d3a658 (patch)
treeb58db2991d16737d4942cad4b63949bc1330ba28 /lib/license/management/shell.rb
parenta49e935ee3e2e07d90da7c78b543a5592a3b1a4a (diff)
parentcd9cd852dac41980169f0521eb795e460994367b (diff)
Merge branch 'heila-license-go-fix' into 'master'v3.11.1
List go modules found in `mod.sum` including modules that do not end up in vendor directory See merge request gitlab-org/security-products/license-management!161
Diffstat (limited to 'lib/license/management/shell.rb')
-rw-r--r--lib/license/management/shell.rb12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/license/management/shell.rb b/lib/license/management/shell.rb
index 9ea66ca..9868f1e 100644
--- a/lib/license/management/shell.rb
+++ b/lib/license/management/shell.rb
@@ -18,7 +18,7 @@ module License
stdout, stderr, status = Open3.capture3(env, expanded_command)
- record(stdout, stderr)
+ record(stdout, stderr, status)
[stdout, stderr, status]
end
@@ -76,9 +76,15 @@ module License
!item.nil? && !item.empty?
end
- def record(stdout, stderr)
+ def record(stdout, stderr, status)
logger.debug(stdout) if present?(stdout)
- logger.error(stderr) if present?(stderr)
+ return unless present?(stderr)
+
+ if status.success?
+ logger.debug(stderr)
+ else
+ logger.error(stderr)
+ end
end
end
end