aboutsummaryrefslogtreecommitdiffstats
path: root/lib/srtgui/api.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/srtgui/api.py')
-rw-r--r--lib/srtgui/api.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/srtgui/api.py b/lib/srtgui/api.py
index 84543789..b3e15acc 100644
--- a/lib/srtgui/api.py
+++ b/lib/srtgui/api.py
@@ -64,10 +64,10 @@ def execute_process(*args):
process.wait()
raise
retcode = process.poll()
- return retcode, stdout.decode('UTF-8'), stderr.decode('UTF-8')
+ return retcode, stdout, stderr
else:
result = subprocess.run(cmd_list, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- return result.returncode,result.stdout.decode('UTF-8'),result.stderr.decode('UTF-8')
+ return result.returncode,result.stdout,result.stderr
#
# Extract Upstream CVE record details
@@ -288,6 +288,9 @@ def summaryCveDetails(cve,cve_sources):
cve_local = CveLocal.objects.get(name=cve.name)
elif None == cve_main:
cve_main = readCveDetails(cve,cs.datasource)
+ if None == cve_main:
+ # Single local summary
+ cve_main = cve_local
# Merge the CVE details
cve_detail.name = cve.name
@@ -325,7 +328,7 @@ def summaryCveDetails(cve,cve_sources):
summaryMerge(cve_detail,cve_main,cve_local,cve_html,'cvssV2_confidentialityImpact')
summaryMerge(cve_detail,cve_main,cve_local,cve_html,'cvssV2_integrityImpact')
- ### TODO: INTELIIGENT CPE_LIST MERGE
+ ### TODO: INTELIGENT CPE_LIST MERGE
cve_detail.cpe_list = cve_main.cpe_list
cve_detail.ref_list = cve_main.ref_list