diff --git a/island/actions/islandAction_deliver.py b/island/actions/islandAction_deliver.py index eddb4b9..394f1ed 100644 --- a/island/actions/islandAction_deliver.py +++ b/island/actions/islandAction_deliver.py @@ -96,7 +96,7 @@ def execute(_arguments): select_branch = commands.get_current_branch(git_repo_path) # create new repo tag - new_version_description = status.create_new_version_repo(git_repo_path, version_description, select_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(version_description)) # merge branch diff --git a/island/actions/status.py b/island/actions/status.py index 779fb76..4700662 100644 --- a/island/actions/status.py +++ b/island/actions/status.py @@ -341,6 +341,22 @@ def create_new_version_repo(git_repo_path, version_description, add_in_version_m valid = True else: debug.info("!!! Must select in range " + str(["1", "2", "3", "4"])) + # limit and force at 3 the nuber of variables + version_description_tmp = version_description + version_description = [] + if len(version_description_tmp) >= 1: + version_description.append(version_description_tmp[0]) + else: + version_description.append(0) + if len(version_description_tmp) >= 2: + version_description.append(version_description_tmp[1]) + else: + version_description.append(0) + if len(version_description_tmp) >= 3: + version_description.append(version_description_tmp[2]) + else: + version_description.append(0) + # increment the version if input1 == "1": version_description[0] += 1 version_description[1] = 0