Make SystemExit errors less redundant in output; verify clean git status on master.
This commit is contained in:
parent
3250b3d34e
commit
b9b7f25fb9
|
@ -25,7 +25,7 @@ def main(args=sys.argv[1:]):
|
||||||
main_logged(opts.RELEASE_VERSION, opts.RELEASE_PREV)
|
main_logged(opts.RELEASE_VERSION, opts.RELEASE_PREV)
|
||||||
except SystemExit as e:
|
except SystemExit as e:
|
||||||
logging.error(str(e))
|
logging.error(str(e))
|
||||||
raise
|
raise SystemExit(1)
|
||||||
except:
|
except:
|
||||||
logging.error(traceback.format_exc())
|
logging.error(traceback.format_exc())
|
||||||
raise
|
raise
|
||||||
|
@ -34,6 +34,7 @@ def main(args=sys.argv[1:]):
|
||||||
# Top-level flow:
|
# Top-level flow:
|
||||||
def main_logged(release, releaseprev):
|
def main_logged(release, releaseprev):
|
||||||
verify_releaseprev_tag(releaseprev)
|
verify_releaseprev_tag(releaseprev)
|
||||||
|
verify_git_clean_master()
|
||||||
raise NotImplementedError(main_logged)
|
raise NotImplementedError(main_logged)
|
||||||
|
|
||||||
|
|
||||||
|
@ -74,6 +75,20 @@ def verify_releaseprev_tag(releaseprev):
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def verify_git_clean_master():
|
||||||
|
junk = sh_out('git', 'status', '--porcelain')
|
||||||
|
if junk.strip():
|
||||||
|
raise SystemExit('There are uncommitted changes:\n' + junk)
|
||||||
|
|
||||||
|
branch = sh_out('git', 'rev-parse', '--abbrev-ref', 'HEAD').strip()
|
||||||
|
if branch != 'master':
|
||||||
|
raise SystemExit(
|
||||||
|
"Expected branch 'master', found branch {!r}".format(
|
||||||
|
branch,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
# Helper code:
|
# Helper code:
|
||||||
def chdir_to_repo():
|
def chdir_to_repo():
|
||||||
dn = os.path.dirname
|
dn = os.path.dirname
|
||||||
|
|
Loading…
Reference in New Issue