From: W. Trevor King Date: Sat, 2 Jan 2016 06:08:01 +0000 (-0800) Subject: nmbug-status: Avoid hard-coded filename in error message X-Git-Tag: 0.22_rc0~87 X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=a07cafae00fa18b1a2182b5ba6db405d79e787c5 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. --- diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status index b36b6ad3..22e3b5b5 100755 --- a/devel/nmbug/nmbug-status +++ b/devel/nmbug/nmbug-status @@ -109,9 +109,9 @@ def read_config(path=None, encoding=None): status = p.wait() if status != 0: raise ConfigError( - ("Missing status-config.json in branch '{branch}' of" - '{nmbgit}. Add the file or explicitly set --config.' - ).format(branch=branch, nmbgit=nmbhome)) + ("Missing {filename} in branch '{branch}' of {nmbgit}. " + 'Add the file or explicitly set --config.' + ).format(filename=filename, branch=branch, nmbgit=nmbhome)) config_json = config_bytes.decode(encoding) try: