mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 06:50:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

scanner: safely check options, for things using this API

Browse source 
https://gitlab.com/fdroid/fdroidserver/-/issues/771#note_353495799
This commit is contained in:
Hans-Christoph Steiner 2020-06-03 18:34:26 +02:00
parent 75acf63efa
commit ee54dbce87
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fdroidserver/scanner.py
View file

@ -172,9 +172,9 @@ def scan_source(build_dir, build=metadata.Build()):
return ignoreproblem(what, path_in_build_dir) return ignoreproblem(what, path_in_build_dir)
if todelete(path_in_build_dir): if todelete(path_in_build_dir):
return removeproblem(what, path_in_build_dir, filepath) return removeproblem(what, path_in_build_dir, filepath)
if options.json: if options and options.json:
json_per_build['errors'].append([what, path_in_build_dir]) json_per_build['errors'].append([what, path_in_build_dir])
if not options.json or options.verbose: if options and (options.verbose or not options.json):
logging.error('Found %s at %s' % (what, path_in_build_dir)) logging.error('Found %s at %s' % (what, path_in_build_dir))
return 1 return 1

1
tests/build.TestCase
View file

@ -132,7 +132,6 @@ class BuildTest(unittest.TestCase):
fdroidserver.common.fill_config_defaults(config) fdroidserver.common.fill_config_defaults(config)
fdroidserver.common.config = config fdroidserver.common.config = config
fdroidserver.build.options = mock.Mock() fdroidserver.build.options = mock.Mock()
fdroidserver.build.options.json = False
fdroidserver.build.options.notarball = True fdroidserver.build.options.notarball = True
fdroidserver.build.options.skipscan = False fdroidserver.build.options.skipscan = False

2
tests/scanner.TestCase
View file

@ -36,7 +36,7 @@ class ScannerTest(unittest.TestCase):
os.chdir(self.basedir) os.chdir(self.basedir)
def test_scan_source_files(self): def test_scan_source_files(self):
fdroidserver.scanner.options = type('', (), {})() fdroidserver.scanner.options = mock.Mock()
fdroidserver.scanner.options.json = False fdroidserver.scanner.options.json = False
source_files = os.path.join(self.basedir, 'source-files') source_files = os.path.join(self.basedir, 'source-files')
projects = { projects = {