diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2022-04-20 14:34:28 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-04-22 14:57:57 +0000 |
| commit | b4fd6d05d73b7a15443328514259f5c2b04073f1 (patch) | |
| tree | cd29a53bc994a4cd482acdc456803b2c717bad10 /buildscripts/blackduck_hub.py | |
| parent | d85516c596248fcb0568e97c2b57f92a631e1cbf (diff) | |
| download | mongo-b4fd6d05d73b7a15443328514259f5c2b04073f1.tar.gz | |
SERVER-64514 Blackduck check return code, update third_party_components.yml
Diffstat (limited to 'buildscripts/blackduck_hub.py')
| -rw-r--r-- | buildscripts/blackduck_hub.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/buildscripts/blackduck_hub.py b/buildscripts/blackduck_hub.py index 53b6af52dd7..111f0d7b03c 100644 --- a/buildscripts/blackduck_hub.py +++ b/buildscripts/blackduck_hub.py @@ -287,7 +287,9 @@ class VersionInfo: self.production_version = True # Abseil has an empty string for one version - if self.ver_str == "": + # Abseil thinks "~" is character to use in versions + # Geary thinks "+" is character to use in versions + if self.ver_str == "" or "~" in self.ver_str or "+" in self.ver_str: self.production_version = False return @@ -570,7 +572,7 @@ curl --retry 5 -s -L https://detect.synopsys.com/detect.sh | bash -s -- --black """.encode()) fp.flush() - subprocess.call(["/bin/sh", fp.name]) + subprocess.check_call(["/bin/sh", fp.name]) def _scan_cmd_args(args): |