support for non PEP 440 version format

ubuntu · Jan 11, 2024 · 4ffad1a · 4ffad1a
1 parent f07e82d
commit 4ffad1a
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/updatesnap/SnapModule/snapmodule.py b/updatesnap/SnapModule/snapmodule.py
@@ -14,6 +14,7 @@
 import yaml
 
 import pkg_resources
+import debian.debian_support
 
 
 class Colors:
@@ -119,11 +120,22 @@ def _get_version(self, part_name, entry, entry_format, check):
         if '%V' in entry_format['format']:
             if not entry.startswith(entry_format['format'].split('%')[0]):
                 return None
-            version = pkg_resources.parse_version(entry[len(entry_format['format'].split('%')[0]):])
-            if (("lower-than" in entry_format) and
-                    (version >= pkg_resources.parse_version(str(entry_format["lower-than"])))):
-                return None
-            return version
+            try:
+                version = pkg_resources.parse_version(
+                        entry[len(entry_format['format'].split('%')[0]):])
+                if (("lower-than" in entry_format) and
+                        (version >= pkg_resources.parse_version(
+                            str(entry_format["lower-than"])))):
+                    return None
+                return version
+            except pkg_resources.extern.packaging.version.InvalidVersion:
+                version = debian.debian_support.Version(
+                    entry[len(entry_format['format'].split('%')[0]):])
+                if (("lower-than" in entry_format) and
+                        (version >= debian.debian_support.Version(
+                            str(entry_format["lower-than"])))):
+                    return None
+                return version
         major = 0
         minor = 0
         revision = 0