Fix micro branch to avoid version and match three digit

Author: matthiasL-scality

bert_e/exceptions.py

@@ -295,7 +295,7 @@ class ReleaseAlreadyExists(InternalException):
 
     def __init__(self, branch, tag):
         msg = 'Branch %r must be deleted as %r has been created, ' \
-              'you must use a hotfix branch if you really intend, ' \
+              'you must use a hotfix branch if you really intend ' \
               'to target this version.' \
               % (branch, tag)
         super(ReleaseAlreadyExists, self).__init__(msg)

bert_e/tests/test_bert_e.py

@@ -489,7 +489,7 @@ def test_four_digit_fix_version(self):
             5: {'name': 'development/10.0', 'ignore': False}
         })
         tags = ['4.3.17.0', '4.3.18', '5.1.3', '5.1.7']
-        fixver = ['4.3.17.1', '4.3.19', '5.1.8', '5.1.9', '10.0.0']
+        fixver = ['4.3.17', '4.3.19', '5.1.8', '5.1.9', '10.0.0']
         with self.assertRaises(exns.ReleaseAlreadyExists):
             self.finalize_cascade(branches, tags, destination, fixver)
 

bert_e/workflow/gitwaterflow/branches.py

@@ -966,10 +966,6 @@ def update_versions(self, tag):
         dev_branch: DevelopmentBranch = branches.get(DevelopmentBranch)
         major_branch: DevelopmentBranch = major_branches.get(DevelopmentBranch)
         micro_branch: DevelopmentBranch = micro_branches.get(DevelopmentBranch)
-        if micro_branch:
-            micro_branch.version = '%d.%d.%d' % (micro_branch.major,
-                                                 micro_branch.minor,
-                                                 micro_branch.micro)
 
         if hf_branch:
             if hf_branch.micro == micro:
@@ -979,10 +975,9 @@ def update_versions(self, tag):
                                                      hf_branch.micro,
                                                      hf_branch.hfrev)
 
-        tag_version_str = f"{major}.{minor}.{micro}"
-
         if micro_branch is not None and \
-           (micro_branch.version == tag_version_str):
+           ([micro_branch.major, micro_branch.minor,
+             micro_branch.micro] == [major, minor, micro]):
             raise errors.ReleaseAlreadyExists(micro_branch, tag)
 
         if dev_branch: