Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 07:23:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply suggestions from code review

Browse source 
Changed wording in a few comments

Co-Authored-By: Atlante45 <clement.brisset@gmail.com>
This commit is contained in:
Stephen Birarda 2018-11-15 18:17:08 -08:00 committed by GitHub
parent 27ecaeb1b6
commit 8b2c9e1c48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/scripts/rc-branches.py
View file

@ -16,7 +16,7 @@ remote_name = "upstream"
remote_master_branch = "{}/master".format(remote_name) remote_master_branch = "{}/master".format(remote_name)
def checkVersionBranches(version): def checkVersionBranches(version):
"""Check the branches for a given version were created properly.""" """Check that the branches for a given version were created properly."""
repo = git.Repository(git.Repository.get_base_directory()) repo = git.Repository(git.Repository.get_base_directory())
@ -77,7 +77,7 @@ def checkVersionBranches(version):
# For patch releases, warn if the base commit is not the previous RC commit # For patch releases, warn if the base commit is not the previous RC commit
if is_patch_release: if is_patch_release:
if not repo.does_tag_exist(version): if not repo.does_tag_exist(version):
logging.warning("The tag {} does not exist, which suggests {} hasn't yet been cut.".format(version, version)) logging.warning("The tag {} does not exist, which suggests {} has not been released.".format(version, version))
if base_commit != previous_rc_commit: if base_commit != previous_rc_commit:
logging.warning("Previous version has commits not in this patch"); logging.warning("Previous version has commits not in this patch");
@ -164,9 +164,9 @@ def createVersionBranches(version):
# Check tag exists, if it doesn't, print warning and ask for comfirmation # Check tag exists, if it doesn't, print warning and ask for comfirmation
if not repo.does_tag_exist(version): if not repo.does_tag_exist(version):
logging.warning("The tag {} does not exist, which suggests {} hasn't yet been cut.".format(version, version)) logging.warning("The tag {} does not exist, which suggests {} has not yet been released.".format(version, version))
logging.warning("Creating the branches now means that they will diverge from {} if anything is merge into it.".format(previous_version)) logging.warning("Creating the branches now means that {} will diverge from {} if anything is merged into {}.".format(version, previous_version, previous_version))
logging.warning("This is not recommanded unless necessary.") logging.warning("This is not recommended unless necessary.")
validAnswer = False validAnswer = False
askCount = 0 askCount = 0