Merge ~jslarraz/ubuntu-security-tools:fix-increment-version into ubuntu-security-tools:master

[Jorge Sancho Larraz]

umt/increment_version: fix regex for ~XX.YY versions

[Ian Constantin (iconstantin)]

The changes lgtm re: what we discussed in sec-priv, thanks!

[Eduardo Barretto (ebarretto)]

lgtm!
I just added a comment, but that could be added to this PR or added later directly.

review: Approve

[Jorge Sancho Larraz (jslarraz)]

Missing test case added in https://git.launchpad.net/~jslarraz/ubuntu-security-tools/commit/?id=b7a1abef32bf738d1c6f826e970df4f50e6d5872 according to @ebaretto comment

diff --git a/build-tools/umt b/build-tools/umt
index b76e9d6..7382143 100755
--- a/build-tools/umt
+++ b/build-tools/umt
@@ -5623,18 +5623,6 @@ def launch_dch(old_ver, new_ver, release=None, note=None, is_devel_release=False
         warn("Suggestion is not valid if releases have the same previous version\n" +
              "Use '%s' style instead\n" % (re.sub('build.*', '', old_ver) + 'ubuntu0.Y.MM.1'))
 
-    release_name = None
-    release_num = None
-    if "security" in release:
-        release_name = release.split("-")[0]
-
-    if release_name:
-        release_num = BetterUbuntuDistroInfo().get_release(release_name)
-
-    if release_num:
-        if release_num == old_ver[-5:]:
-            new_ver = old_ver+".1"
-
     if is_devel_release and not build:
         command = ['/usr/bin/dch', '-i']
     else:
diff --git a/package-tools/increment_version.py b/package-tools/increment_version.py
index 8fa2669..e56dc1e 100644
--- a/package-tools/increment_version.py
+++ b/package-tools/increment_version.py
@@ -157,20 +157,28 @@ def increment_version_security(old_version, esm=False, devel=False, details=None
         new_version = old_version + suffix
         if esm:
             new_version = new_version + "~esm1"
-    elif re.search("~([0-9]+\\.)?([0-9]{2}\\.[0-9]{2})(\\.[0-9]+)$", old_version):
+    elif re.search("~([0-9]+\\.)?([0-9]{2}\\.[0-9]{2})(\\.[0-9]+)?$", old_version):
         # eg. ~XX.YY ~XX.YY.1, ~0.XX.YY.1
         if devel:
             new_version = increment_version_security(old_version.split("~")[0], esm=esm, devel=devel)
         else:
-            split = old_version.split(".")
-            if len(split) == 2:
+            # Intentionally not handling potential errors with details["release"] not in subprojects
+            # or release_name.split(' ')[1] being len 1. It should not happen. If it crash we will
+            # have the chance to look at the code instead of proposing a wrong version
+            release_name = cve_lib.subprojects['ubuntu/' + details["release"]]['name']
+            release_id = release_name.split(' ')[1]
+
+            # Handle ~XX.YY and ~0.XX.YY
+            if old_version.endswith(release_id):
                 new_version = old_version + ".1"
                 if esm:
                     new_version = new_version + "~esm1"
+            # Handle ~0.XX.YY.1
             else:
                 if esm:
                     new_version = old_version + "+esm1"
                 else:
+                    split = old_version.split(".")
                     new_version = re.sub(
                         "\\.[0-9]+$", "." + str(int(split[len(split) - 1]) + 1), old_version
                     )
diff --git a/package-tools/test_increment_version.py b/package-tools/test_increment_version.py
index bebc5b0..6065217 100755
--- a/package-tools/test_increment_version.py
+++ b/package-tools/test_increment_version.py
@@ -46,6 +46,11 @@ class TestIncrementVersion(unittest.TestCase):
             TC("2.0cvs.20060707-2", "2.0cvs.20060707-2ubuntu1", devel=True),
             TC("2.0-2ubuntu0.1~esm9", "2.0-2ubuntu0.1~esm10", esm=True),
             TC("2.1.0-3build2~16.04.1", "2.1.0-3ubuntu0.1~esm1", esm=True),
+            TC("2.1.0-1~0.16.04", "2.1.0-1~0.16.04.1", esm=False, details={'release': 'xenial'}),
+            TC("2.1.0-1~16.04", "2.1.0-1~16.04.1", esm=False, details={'release': 'xenial'}),
+            TC("2.1.0-1~16.04.1", "2.1.0-1~16.04.2", esm=False, details={'release': 'xenial'}),
+            TC("2.1.0-1~16.04", "2.1.0-1~16.04.1~esm1", esm=True, details={'release': 'xenial'}),
+            TC("2.1.0-1~16.04.1~esm1", "2.1.0-1~16.04.1~esm2", esm=True, details={'release': 'xenial'}),
             TC("4.3-1", "4.3-1ubuntu0.1", details={'package': 'plib', 'release': 'focal'},
                pkg_list={'focal': ['4.3-1', '', ''], 'jammy': ['4.3-2', '', '']},
                msg="The exact same version is not used in other releases (debian build changes)"),