Changeset View
Changeset View
Standalone View
Standalone View
build_files/utils/make_update.py
| Context not available. | |||||
| sys.exit(1) | sys.exit(1) | ||||
| # Abort if a rebase is still progress. | # Abort if a rebase is still progress. | ||||
| rebase_merge = check_output([args.git_command, 'rev-parse', '--git-path', 'rebase-merge'], exit_on_error=False) | rebase_merge = check_output([args.git_command, 'rev-parse', '--git-path', 'rebase-merge']) | ||||
| rebase_apply = check_output([args.git_command, 'rev-parse', '--git-path', 'rebase-apply'], exit_on_error=False) | rebase_apply = check_output([args.git_command, 'rev-parse', '--git-path', 'rebase-apply']) | ||||
| merge_head = check_output([args.git_command, 'rev-parse', '--git-path', 'MERGE_HEAD'], exit_on_error=False) | merge_head = check_output([args.git_command, 'rev-parse', '--git-path', 'MERGE_HEAD']) | ||||
| if os.path.exists(rebase_merge) or \ | if os.path.exists(rebase_merge) or \ | ||||
| os.path.exists(rebase_apply) or \ | os.path.exists(rebase_apply) or \ | ||||
| os.path.exists(merge_head): | os.path.exists(merge_head): | ||||
| Context not available. | |||||