From 294799e2f55217e66ddc783e61cef2b5bb26053d Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 11 Jun 2020 11:43:27 +0200 Subject: [PATCH] scanner: fix options handling closes fdroid/fdroidserver#789 --- fdroidserver/scanner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py index 1c30d189..ad33de13 100644 --- a/fdroidserver/scanner.py +++ b/fdroidserver/scanner.py @@ -176,9 +176,9 @@ def scan_source(build_dir, build=metadata.Build()): return removeproblem(what, path_in_build_dir, filepath) if 'src/test' in filepath or '/test/' in filepath: return warnproblem(what, path_in_build_dir) - if options and options.json: + if options and 'json' in vars(options) and options.json: json_per_build['errors'].append([what, path_in_build_dir]) - if options and (options.verbose or not options.json): + if options and (options.verbose or not ('json' in vars(options) and options.json)): logging.error('Found %s at %s' % (what, path_in_build_dir)) return 1