Merge pull request #2106 from MediaBrowser/dev

fix version comparison
pull/702/head
Luke 8 years ago committed by GitHub
commit 9305573e96

@ -66,29 +66,23 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
if (releases.Count >= 1) if (releases.Count >= 1)
{ {
var release = releases[0]; var release = releases[0];
Version version; var version = ParseVersion(release.tag_name);
if (Version.TryParse(release.tag_name, out version)) if (version != null && currentVersion > version)
{
if (currentVersion > version)
{ {
newUpdateLevel = PackageVersionClass.Beta; newUpdateLevel = PackageVersionClass.Beta;
} }
} }
}
// If the current version is later than current beta, set the update level to dev // If the current version is later than current beta, set the update level to dev
if (releases.Count >= 2) if (releases.Count >= 2)
{ {
var release = releases[1]; var release = releases[1];
Version version; var version = ParseVersion(release.tag_name);
if (Version.TryParse(release.tag_name, out version)) if (version != null && currentVersion > version)
{
if (currentVersion > version)
{ {
newUpdateLevel = PackageVersionClass.Dev; newUpdateLevel = PackageVersionClass.Dev;
} }
} }
}
if (newUpdateLevel != updateLevel) if (newUpdateLevel != updateLevel)
{ {
@ -96,5 +90,19 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
_config.SaveConfiguration(); _config.SaveConfiguration();
} }
} }
private Version ParseVersion(string versionString)
{
var parts = versionString.Split('.');
if (parts.Length == 3)
{
versionString += ".0";
}
Version version;
Version.TryParse(versionString, out version);
return version;
}
} }
} }

Loading…
Cancel
Save