summaryrefslogtreecommitdiffstats
path: root/meta/classes/spdx.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/spdx.bbclass')
-rw-r--r--meta/classes/spdx.bbclass11
1 files changed, 5 insertions, 6 deletions
diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass
index 0c9276584c..89394d3a96 100644
--- a/meta/classes/spdx.bbclass
+++ b/meta/classes/spdx.bbclass
@@ -219,14 +219,13 @@ def hash_string(data):
219def run_fossology(foss_command, full_spdx): 219def run_fossology(foss_command, full_spdx):
220 import string, re 220 import string, re
221 import subprocess 221 import subprocess
222 222
223 p = subprocess.Popen(foss_command.split(), 223 try:
224 stdout=subprocess.PIPE, stderr=subprocess.PIPE) 224 foss_output = subprocess.check_output(foss_command.split(),
225 foss_output, foss_error = p.communicate() 225 stderr=subprocess.STDOUT).decode('utf-8')
226 if p.returncode != 0: 226 except subprocess.CalledProcessError as e:
227 return None 227 return None
228 228
229 foss_output = unicode(foss_output, "utf-8")
230 foss_output = string.replace(foss_output, '\r', '') 229 foss_output = string.replace(foss_output, '\r', '')
231 230
232 # Package info 231 # Package info