X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/d5abffb3c868e3cf98e565a1e158eeaa333292d1..ee11f936d4f2ce49965c18c2d9837fe98dd614b7:/pinch.py?ds=inline diff --git a/pinch.py b/pinch.py index bc9ba3b..6beb4e2 100644 --- a/pinch.py +++ b/pinch.py @@ -422,7 +422,9 @@ def compare_tarball_and_git( if ee in errors: errors.remove(ee) benign_errors.append(ee) - v.check(f'{len(errors)} unexpected incomparable files', len(errors) == 0) + v.check( + f'{len(errors)} unexpected incomparable files: {errors}', + len(errors) == 0) v.check( f'({len(benign_errors)} of {len(expected_errors)} expected incomparable files)', len(benign_errors) == len(expected_errors)) @@ -585,7 +587,7 @@ def read_pinned_config_section( section: str, conf: configparser.SectionProxy) -> Tuple[SearchPath, Pin]: sp, pin = read_config_section(conf) if pin is None: - raise Exception( + raise RuntimeError( f'Cannot update unpinned channel "{section}" (Run "pin" before "update")') return sp, pin @@ -604,7 +606,7 @@ def read_config_files( config = read_config(file) for section in config.sections(): if section in merged_config: - raise Exception('Duplicate channel "{section}"') + raise RuntimeError('Duplicate channel "{section}"') merged_config[section] = config[section] return merged_config