Merge ~smoser/curtin:fix/1786795-get_package_version into curtin:master

[Scott Moser]

parse_dpkg_version: support non-numeric in version string.

This fixes parse_dpkg_version for packages with non-numeric (0-9.)
in their versions. It also improves it to work for native packages.
Native packages do not have '-'. Also adds tests of parse_dpkg_version.

LP: #1786795

see commit message

[Ryan Harper (raharper)]

Really nice clean up. Thanks!

review: Approve

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:65527db16775cfebcbe5a38d210040ceea2f36f7
https://jenkins.ubuntu.com/server/job/curtin-ci/1028/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/1028/console
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/1028/console
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/1028/console
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/1028/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/1028/rebuild

review: Needs Fixing (continuous-integration)

3814cac... by Scott Moser on 2018-08-13

flake8

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:3814cacbd756549fa139cf0eae3ae3e8542a884e
https://jenkins.ubuntu.com/server/job/curtin-ci/1029/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/1029
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/1029
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/1029
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/1029

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/1029/rebuild

review: Approve (continuous-integration)

diff --git a/curtin/util.py b/curtin/util.py
index 7d06c09..3c868b7 100644
--- a/curtin/util.py
+++ b/curtin/util.py
@@ -810,13 +810,37 @@ def parse_dpkg_version(raw, name=None, semx=None):
     """Parse a dpkg version string into various parts and calcualate a
        numerical value of the version for use in comparing package versions
 
-       returns a dictionary with the results
+       Native packages (without a '-'), will have the package version treated
+       as the upstream version.
+
+       returns a dictionary with fields:
+          'major' (int), 'minor' (int), 'micro' (int),
+          'semantic_version' (int),
+          'extra' (string), 'raw' (string), 'upstream' (string),
+          'name' (present only if name is not None)
     """
+    if not isinstance(raw, string_types):
+        raise TypeError(
+            "Invalid type %s for parse_dpkg_version" % raw.__class__)
+
     if semx is None:
         semx = (10000, 100, 1)
 
-    upstream = raw.split('-')[0]
-    toks = upstream.split(".", 2)
+    if "-" in raw:
+        upstream = raw.rsplit('-', 1)[0]
+    else:
+        # this is a native package, package version treated as upstream.
+        upstream = raw
+
+    match = re.search(r'[^0-9.]', upstream)
+    if match:
+        extra = upstream[match.start():]
+        upstream_base = upstream[:match.start()]
+    else:
+        upstream_base = upstream
+        extra = None
+
+    toks = upstream_base.split(".", 2)
     if len(toks) == 3:
         major, minor, micro = toks
     elif len(toks) == 2:
@@ -825,9 +849,10 @@ def parse_dpkg_version(raw, name=None, semx=None):
         major, minor, micro = (toks[0], 0, 0)
 
     version = {
-        'major': major,
-        'minor': minor,
-        'micro': micro,
+        'major': int(major),
+        'minor': int(minor),
+        'micro': int(micro),
+        'extra': extra,
         'raw': raw,
         'upstream': upstream,
     }
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
index 483cd5d..7fb332d 100644
--- a/tests/unittests/test_util.py
+++ b/tests/unittests/test_util.py
@@ -4,6 +4,7 @@ from unittest import skipIf
 import mock
 import os
 import stat
+import sys
 from textwrap import dedent
 
 from curtin import util
@@ -1035,4 +1036,65 @@ class TestLoadKernelModule(CiTestCase):
         self.assertEqual(0, self.m_subp.call_count)
 
 
+class TestParseDpkgVersion(CiTestCase):
+    """test parse_dpkg_version."""
+
+    def test_none_raises_type_error(self):
+        self.assertRaises(TypeError, util.parse_dpkg_version, None)
+
+    @skipIf(sys.version_info.major < 3, "python 2 bytes are strings.")
+    def test_bytes_raises_type_error(self):
+        self.assertRaises(TypeError, util.parse_dpkg_version, b'1.2.3-0')
+
+    def test_simple_native_package_version(self):
+        """dpkg versions must have a -. If not present expect value error."""
+        self.assertEqual(
+            {'major': 2, 'minor': 28, 'micro': 0, 'extra': None,
+             'raw': '2.28', 'upstream': '2.28', 'name': 'germinate',
+             'semantic_version': 22800},
+            util.parse_dpkg_version('2.28', name='germinate'))
+
+    def test_complex_native_package_version(self):
+        dver = '1.0.106ubuntu2+really1.0.97ubuntu1'
+        self.assertEqual(
+            {'major': 1, 'minor': 0, 'micro': 106,
+             'extra': 'ubuntu2+really1.0.97ubuntu1',
+             'raw': dver, 'upstream': dver, 'name': 'debootstrap',
+             'semantic_version': 100106},
+            util.parse_dpkg_version(dver, name='debootstrap',
+                                    semx=(100000, 1000, 1)))
+
+    def test_simple_valid(self):
+        self.assertEqual(
+            {'major': 1, 'minor': 2, 'micro': 3, 'extra': None,
+             'raw': '1.2.3-0', 'upstream': '1.2.3', 'name': 'foo',
+             'semantic_version': 10203},
+            util.parse_dpkg_version('1.2.3-0', name='foo'))
+
+    def test_simple_valid_with_semx(self):
+        self.assertEqual(
+            {'major': 1, 'minor': 2, 'micro': 3, 'extra': None,
+             'raw': '1.2.3-0', 'upstream': '1.2.3',
+             'semantic_version': 123},
+            util.parse_dpkg_version('1.2.3-0', semx=(100, 10, 1)))
+
+    def test_upstream_with_hyphen(self):
+        """upstream versions may have a hyphen."""
+        cver = '18.2-14-g6d48d265-0ubuntu1'
+        self.assertEqual(
+            {'major': 18, 'minor': 2, 'micro': 0, 'extra': '-14-g6d48d265',
+             'raw': cver, 'upstream': '18.2-14-g6d48d265',
+             'name': 'cloud-init', 'semantic_version': 180200},
+            util.parse_dpkg_version(cver, name='cloud-init'))
+
+    def test_upstream_with_plus(self):
+        """multipath tools has a + in it."""
+        mver = '0.5.0+git1.656f8865-5ubuntu2.5'
+        self.assertEqual(
+            {'major': 0, 'minor': 5, 'micro': 0, 'extra': '+git1.656f8865',
+             'raw': mver, 'upstream': '0.5.0+git1.656f8865',
+             'semantic_version': 500},
+            util.parse_dpkg_version(mver))
+
+
 # vi: ts=4 expandtab syntax=python