pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix/compatibilityCheck' into devel

Browse source 
Conflicts:
	src/octoprint/plugins/pluginmanager/__init__.py
This commit is contained in:
Gina Häußge 2015-12-14 14:24:03 +01:00
commit 7232df686a
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/octoprint/plugins/pluginmanager/__init__.py
View file

@ -576,9 +576,6 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
def map_repository_entry(entry):
result = dict(entry)
if not "follow_dependency_links" in result:
result["follow_dependency_links"] = False
if not "follow_dependency_links" in result:
result["follow_dependency_links"] = False
@ -650,6 +647,7 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
if part.startswith("*"):
break
base_version.append(part)
base_version.append("*final")
octoprint_version = tuple(base_version)
else:
# new setuptools