Merge branch 'develop'

ngld · Feb 8, 2020 · 28e7868 · 28e7868
2 parents f4a1aa4 + 0ad9035
commit 28e7868
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ __pycache__
 build
 dist
 version-rthook.py
+/knossos/parser.out
 /knossos/ui/*
 /knossos/data/resources.rcc
 /knossos/data/resources.qrc

diff --git a/knossos/repo.py b/knossos/repo.py
@@ -483,7 +483,7 @@ def set(self, values):
         self.mid = values['id']
         self.title = values['title']
         self.mtype = values.get('type', 'mod')  # Backwards compatibility
-        self.version = semantic_version.Version(values['version'], partial=True)
+        self.version = semantic_version.Version.coerce(values['version'])
         self.stability = values.get('stability', 'stable')
         self.parent = values.get('parent', 'FS2')
         self.cmdline = values.get('cmdline', '')

diff --git a/knossos/web.py b/knossos/web.py
@@ -241,7 +241,7 @@ def _get_mod(self, mid, spec=None, mod_repo=None):
                 spec = None
             else:
                 if re.search(r'^\d+', spec):
-                    spec = '==' + spec
+                    spec = '==' + str(semantic_version.Version.coerce(spec))
 
                 try:
                     spec = util.Spec(spec)