Merge ~racb/git-ubuntu:fix-build-version-comparison into git-ubuntu:master

[Robie Basak]

Make Jenkins happy

I couldn't reproduce Bryce's original issue (https://bugs.launchpad.net/usd-importer/+bug/1868631/comments/3) but here's the fix for the obvious bug he pointed out.

Since there are no tests, I wonder if Bryce could reproduce the failure and verify that this fixes it correctly, without introducing any new issues?

[Robie Basak (racb)]

(this isn't strictly bug 1868631 but a different root cause so I'm not closing that bug from here)

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

FAILED: Continuous integration, rev:133c4f1e0a624b04b272bc4dbd648465f8ff9875
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/8/
Executed test runs:
    SUCCESS: VM Setup
    FAILED: Build

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

review: Needs Fixing (continuous-integration)

[Bryce Harrington (bryce)]

I can reproduce the original issue, but jenkins seems not responding for some reason so couldn't test against the snap.

However I dummied up a test to verify the proposed fix should work:

from gitubuntu.versioning import Version

if __name__ == '__main__':
    spi_upstream_version = '6.4.15'
    changelog_version = '6.4.5-1ubuntu1'

    if spi_upstream_version < changelog_version:
        print("spi_upstream_version < changelog_version")
        print(" %s < %s" %(spi_upstream_version, changelog_version))
    else:
        print("spi_upstream_version >= changelog_version")
        print(" %s >= %s" %(spi_upstream_version, changelog_version))

    if Version(spi_upstream_version) < Version(changelog_version):
        print("Version(spi_upstream_version) < Version(changelog_version)")
        print(" Version(%s) < Version(%s)" %(spi_upstream_version, changelog_version))
    else:
        print("Version(spi_upstream_version) >= Version(changelog_version)")
        print(" Version(%s) >= Version(%s)" %(spi_upstream_version, changelog_version))

with output as:

fetchmail-fix-c2035-hirsute+21.04:~/src/GitUbuntu/usd-importer$ ./bin/test-fix
spi_upstream_version < changelog_version
  6.4.15 < 6.4.5-1ubuntu1
Version(spi_upstream_version) >= Version(changelog_version)
  Version(6.4.15) >= Version(6.4.5-1ubuntu1)

review: Approve

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

PASSED: Continuous integration, rev:d13680cf5787e4cf6939c60ce71fd089a4c66d0a
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/22/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: VM Reset
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

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

review: Approve (continuous-integration)

diff --git a/gitubuntu/build.py b/gitubuntu/build.py
index 4606a6c..8b006a8 100644
--- a/gitubuntu/build.py
+++ b/gitubuntu/build.py
@@ -46,6 +46,7 @@ from gitubuntu.source_information import (
     derive_codename_from_series,
 )
 from gitubuntu.test_util import get_test_changelog
+from gitubuntu.versioning import Version
 from debian.debfile import PART_EXTS
 import petname
 import pygit2
@@ -340,7 +341,7 @@ def fetch_orig_from_launchpad(changelog, source, pullfile, retries,
             spi.version,
             changelog.upstream_version,
         )
-        if spi.upstream_version < changelog.upstream_version:
+        if Version(spi.upstream_version) < Version(changelog.upstream_version):
             logging.info(
                 "New upstream version detected (%s) which is after the last "
                 "published upstream version (%s).",