Skip to content

Commit 9e69498

Browse files
authored
Merge pull request diffblue#544 from diffblue/jd/feature/validate_config_files
Validate that we have a config file for prepare-scan
2 parents 210a462 + 24cc64b commit 9e69498

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

driver/run.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -469,10 +469,14 @@ def __main():
469469
cmdline.run_scan = ''
470470

471471
# If we have an entry for prepare_scan but it's an empty string, default.
472-
if cmdline.prepare_scan is not None and not cmdline.prepare_scan:
473-
default_path = '../src/java-class-info/default_config.json'
474-
if os.path.isfile(default_path):
475-
cmdline.prepare_scan = os.path.abspath(default_path)
472+
if cmdline.prepare_scan == '':
473+
default_config_path = '../src/java-class-info/default_config.json'
474+
if os.path.isfile(default_config_path):
475+
cmdline.prepare_scan = os.path.abspath(default_config_path)
476+
else:
477+
print("ERROR: No config file for entry point detection passed in via --prepare-scan"
478+
" and the default file can't be found at {0}.".format(default_config_path))
479+
return
476480

477481
if cmdline.name is None:
478482
cmdline.name = os.path.basename(cmdline.install_dir)

0 commit comments

Comments
 (0)