From 77fc465524e01161a1f6dcd9e5669ff53424280f Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Wed, 28 Aug 2019 01:08:35 +0200 Subject: [PATCH] [DEBUG] correct no update --- island/actions/islandAction_deliver.py | 3 ++- island/actions/islandAction_manifest-deliver.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/island/actions/islandAction_deliver.py b/island/actions/islandAction_deliver.py index 8e826c0..0e7d842 100644 --- a/island/actions/islandAction_deliver.py +++ b/island/actions/islandAction_deliver.py @@ -101,7 +101,8 @@ def execute(_arguments): # 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) debug.info("new version: " + str(new_version_description)) - + if new_version_description == None: + continue # merge branch if mani.deliver_mode == "merge": merge_force = True diff --git a/island/actions/islandAction_manifest-deliver.py b/island/actions/islandAction_manifest-deliver.py index 6561cf0..709e157 100644 --- a/island/actions/islandAction_manifest-deliver.py +++ b/island/actions/islandAction_manifest-deliver.py @@ -102,7 +102,8 @@ def execute(_arguments): # 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) debug.info("new version: " + str(new_version_description)) - + if new_version_description == None: + return # merge branch commands.checkout(git_repo_path, destination_branch) if mani.deliver_mode == "merge":