Ignore a leading v or V in github release tags.

This fixes OctoPrint#1723 .
eyal0 · Jan 21, 2017 · 0fa8d1c · 0fa8d1c
1 parent 1014712
commit 0fa8d1c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/octoprint/plugins/pluginmanager/__init__.py b/src/octoprint/plugins/pluginmanager/__init__.py
@@ -667,6 +667,9 @@ def _get_octoprint_version(self, base=False):
 			if isinstance(octoprint_version, tuple):
 				# old setuptools
 				base_version = []
+				# A leading v is common in github release tags. Remove it.
+				if len(version_tuple) > 1 and version_tuple[0].lower == "*v":
+					version_tuple = version_tuple[1:]
 				for part in octoprint_version:
 					if part.startswith("*"):
 						break

diff --git a/src/octoprint/plugins/softwareupdate/version_checks/github_release.py b/src/octoprint/plugins/softwareupdate/version_checks/github_release.py
@@ -140,6 +140,9 @@ def _get_base_from_version_tuple(version_tuple):
 	"""
 
 	base_version = []
+	# A leading v is common in github release tags. Remove it.
+	if len(version_tuple) > 1 and version_tuple[0].lower == "*v":
+		version_tuple = version_tuple[1:]
 	for part in version_tuple:
 		if part.startswith("*"):
 			break