atria-tools/island
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] correct no update

Browse Source
This commit is contained in:
Edouard DUPIN 2019-08-28 01:08:35 +02:00
parent c709ddc730
commit 77fc465524
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
island/actions/islandAction_deliver.py
View File

@ -101,7 +101,8 @@ def execute(_arguments):
# create new repo tag # create new repo tag
new_version_description = status.create_new_version_repo(git_repo_path, version_description, add_in_version_management, source_branch, destination_branch) new_version_description = status.create_new_version_repo(git_repo_path, version_description, add_in_version_management, source_branch, destination_branch)
debug.info("new version: " + str(new_version_description)) debug.info("new version: " + str(new_version_description))
if new_version_description == None:
continue
# merge branch # merge branch
if mani.deliver_mode == "merge": if mani.deliver_mode == "merge":
merge_force = True merge_force = True

3
island/actions/islandAction_manifest-deliver.py
View File

@ -102,7 +102,8 @@ def execute(_arguments):
# create new repo tag # create new repo tag
new_version_description = status.create_new_version_repo(git_repo_path, version_description, add_in_version_management, source_branch, destination_branch) new_version_description = status.create_new_version_repo(git_repo_path, version_description, add_in_version_management, source_branch, destination_branch)
debug.info("new version: " + str(new_version_description)) debug.info("new version: " + str(new_version_description))
if new_version_description == None:
return
# merge branch # merge branch
commands.checkout(git_repo_path, destination_branch) commands.checkout(git_repo_path, destination_branch)
if mani.deliver_mode == "merge": if mani.deliver_mode == "merge":