support/scripts/pkg-stats: fix flake8 errors
support/scripts/pkg-stats:81:22: E211 whitespace before '(' support/scripts/pkg-stats:404:1: E305 expected 2 blank lines after class or function definition, found 1 support/scripts/pkg-stats:561:12: E713 test for membership should be 'not in' support/scripts/pkg-stats:567:1: E302 expected 2 blank lines, found 1 support/scripts/pkg-stats:595:1: E302 expected 2 blank lines, found 1 support/scripts/pkg-stats:1051:1: E302 expected 2 blank lines, found 1 support/scripts/pkg-stats:1057:1: E302 expected 2 blank lines, found 1 Also fix: support/scripts/pkg-stats:1054:5: E722 do not use bare 'except' found by a more recent flake8 version. The exception may be either IndexError or AttributeError, so use Exception to catch either. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
parent
856a651875
commit
24dc403be3
|
@ -78,7 +78,7 @@ class Package:
|
||||||
all_license_files = list()
|
all_license_files = list()
|
||||||
all_versions = dict()
|
all_versions = dict()
|
||||||
all_ignored_cves = dict()
|
all_ignored_cves = dict()
|
||||||
all_cpeids = dict ()
|
all_cpeids = dict()
|
||||||
# This is the list of all possible checks. Add new checks to this list so
|
# This is the list of all possible checks. Add new checks to this list so
|
||||||
# a tool that post-processeds the json output knows the checks before
|
# a tool that post-processeds the json output knows the checks before
|
||||||
# iterating over the packages.
|
# iterating over the packages.
|
||||||
|
@ -401,6 +401,7 @@ def package_init_make_info():
|
||||||
pkgvar = pkgvar[:-7]
|
pkgvar = pkgvar[:-7]
|
||||||
Package.all_cpeids[pkgvar] = value
|
Package.all_cpeids[pkgvar] = value
|
||||||
|
|
||||||
|
|
||||||
check_url_count = 0
|
check_url_count = 0
|
||||||
|
|
||||||
|
|
||||||
|
@ -558,12 +559,13 @@ async def check_package_latest_version(packages):
|
||||||
|
|
||||||
def check_package_cve_affects(cve, cpe_product_pkgs):
|
def check_package_cve_affects(cve, cpe_product_pkgs):
|
||||||
for product in cve.affected_products:
|
for product in cve.affected_products:
|
||||||
if not product in cpe_product_pkgs:
|
if product not in cpe_product_pkgs:
|
||||||
continue
|
continue
|
||||||
for pkg in cpe_product_pkgs[product]:
|
for pkg in cpe_product_pkgs[product]:
|
||||||
if cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves, pkg.cpeid) == cve.CVE_AFFECTS:
|
if cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves, pkg.cpeid) == cve.CVE_AFFECTS:
|
||||||
pkg.cves.append(cve.identifier)
|
pkg.cves.append(cve.identifier)
|
||||||
|
|
||||||
|
|
||||||
def check_package_cves(nvd_path, packages):
|
def check_package_cves(nvd_path, packages):
|
||||||
if not os.path.isdir(nvd_path):
|
if not os.path.isdir(nvd_path):
|
||||||
os.makedirs(nvd_path)
|
os.makedirs(nvd_path)
|
||||||
|
@ -592,6 +594,7 @@ def check_package_cves(nvd_path, packages):
|
||||||
else:
|
else:
|
||||||
pkg.status['cve'] = ("ok", "not affected by CVEs")
|
pkg.status['cve'] = ("ok", "not affected by CVEs")
|
||||||
|
|
||||||
|
|
||||||
def calculate_stats(packages):
|
def calculate_stats(packages):
|
||||||
stats = defaultdict(int)
|
stats = defaultdict(int)
|
||||||
stats['packages'] = len(packages)
|
stats['packages'] = len(packages)
|
||||||
|
@ -1048,12 +1051,14 @@ def parse_args():
|
||||||
parser.error('at least one of --html or --json (or both) is required')
|
parser.error('at least one of --html or --json (or both) is required')
|
||||||
return args
|
return args
|
||||||
|
|
||||||
|
|
||||||
def cpeid_name(pkg):
|
def cpeid_name(pkg):
|
||||||
try:
|
try:
|
||||||
return pkg.cpeid.split(':')[1]
|
return pkg.cpeid.split(':')[1]
|
||||||
except:
|
except Exception: # cpeid may be None, or improperly formatted
|
||||||
return ''
|
return ''
|
||||||
|
|
||||||
|
|
||||||
def __main__():
|
def __main__():
|
||||||
args = parse_args()
|
args = parse_args()
|
||||||
if args.packages:
|
if args.packages:
|
||||||
|
|
Loading…
Reference in a new issue