nmbug-status: Avoid hard-coded filename in error message

We already have a 'filename' variable with the name, so stay DRY and
use that variable here.

Also fix a missing-whitespace error from bed8b674 (nmbug-status:
Clarify errors for illegible configs, 2014-05-10), wrapping on the
sentence to match similar error-generation earlier in this function.
This commit is contained in:
W. Trevor King 2016-01-01 22:08:01 -08:00 committed by David Bremner
parent 570c0aeb40
commit a07cafae00

View file

@ -109,9 +109,9 @@ def read_config(path=None, encoding=None):
status = p.wait() status = p.wait()
if status != 0: if status != 0:
raise ConfigError( raise ConfigError(
("Missing status-config.json in branch '{branch}' of" ("Missing {filename} in branch '{branch}' of {nmbgit}. "
'{nmbgit}. Add the file or explicitly set --config.' 'Add the file or explicitly set --config.'
).format(branch=branch, nmbgit=nmbhome)) ).format(filename=filename, branch=branch, nmbgit=nmbhome))
config_json = config_bytes.decode(encoding) config_json = config_bytes.decode(encoding)
try: try: