Fixed issue when issues could not be retrieved

This commit is contained in:
Peter Mosmans
2016-09-14 18:40:53 +10:00
parent 707a119cc8
commit 3772eb96b7

View File

@@ -26,7 +26,6 @@ from __future__ import unicode_literals
import argparse import argparse
import collections import collections
import os import os
import re
import sys import sys
import textwrap import textwrap
@@ -43,6 +42,9 @@ except ImportError:
def add_finding(issue, options): def add_finding(issue, options):
"""
Writes issue as XML finding to file.
"""
title = validate_report.capitalize(issue.title.strip()) title = validate_report.capitalize(issue.title.strip())
print_status('{0} - {1} - {2}'.format(issue.state, issue.labels, print_status('{0} - {1} - {2}'.format(issue.state, issue.labels,
title), options) title), options)
@@ -127,13 +129,11 @@ def convert_markdown(text):
""" """
result = text result = text
return result return result
print('EXAMINING ' + text + ' END') # print('EXAMINING ' + text + ' END')
monospace = re.findall("\`\`\`(.*?)\`\`\`", text, re.DOTALL) # monospace = re.findall("\`\`\`(.*?)\`\`\`", text, re.DOTALL)
print(monospace) # if len(monospace):
if len(monospace): # result = {}
print('YESSS ' + monospace) # result['monospace'] = ''.join(monospace)
result = {}
result['monospace'] = ''.join(monospace)
def list_issues(gitserver, options): def list_issues(gitserver, options):
@@ -141,7 +141,7 @@ def list_issues(gitserver, options):
Lists all issues for options['issues'] Lists all issues for options['issues']
""" """
try: try:
for issue in gitserver.projects.get(options['issues']).issues.list(all=True): for issue in gitserver.project_issues.list(project_id=options['issues']):
if issue.state == 'closed' and not options['closed']: if issue.state == 'closed' and not options['closed']:
continue continue
if 'finding' in issue.labels: if 'finding' in issue.labels:
@@ -149,7 +149,7 @@ def list_issues(gitserver, options):
if 'non-finding' in issue.labels: if 'non-finding' in issue.labels:
add_non_finding(issue, options) add_non_finding(issue, options)
except Exception as e: except Exception as e:
print_error('could not find any issues {{0}'.format(e), -1) print_error('could not find any issues ({0})'.format(e), -1)
def list_projects(gitserver): def list_projects(gitserver):