Merge #2817 Fix comparison of 1.0.0 to 1.0

KSP-CKAN · Jun 28, 2019 · 30061c4 · 30061c4
2 parents bf9c330 + 6a186f4
commit 30061c4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,7 @@ All notable changes to this project will be documented in this file.
 - [Netkan] Fix http kref validation (#2811 by: HebaruSan; reviewed: DasSkelett)
 - [Netkan] Fix Netkan localization parser performance (#2816 by: HebaruSan; reviewed: DasSkelett)
 - [GUI] Support newlines in GUI description field (#2818 by: HebaruSan; reviewed: DasSkelett)
+- [Core] Fix comparison of 1.0.0 to 1.0 (#2817 by: HebaruSan; reviewed: DasSkelett)
 
 ### Internal
 - [Build] Update packages (#2775 by: Olympic1; reviewed: DasSkelett, HebaruSan)

diff --git a/Core/Types/GameComparator/StrictGameComparator.cs b/Core/Types/GameComparator/StrictGameComparator.cs
@@ -1,5 +1,6 @@
-using CKAN.Versioning;
 using System;
+using log4net;
+using CKAN.Versioning;
 
 namespace CKAN
 {
@@ -23,15 +24,16 @@ public override bool SingleVersionsCompatible(KspVersion gameVersion, CkanModule
             {
                 if (module.ksp_version_min != null && module.ksp_version_max != null)
                 {
-                    if (module.ksp_version_min <= module.ksp_version_max)
+                    var minRange = module.ksp_version_min.ToVersionRange();
+                    var maxRange = module.ksp_version_max.ToVersionRange();
+                    if (minRange.Lower.Value <= maxRange.Upper.Value)
                     {
-                        var minRange = module.ksp_version_min.ToVersionRange();
-                        var maxRange = module.ksp_version_max.ToVersionRange();
-
                         moduleRange = new KspVersionRange(minRange.Lower, maxRange.Upper);
                     }
                     else
                     {
+                        log.WarnFormat("{0} is not less or equal to {1}",
+                            module.ksp_version_min, module.ksp_version_max);
                         return false;
                     }
                 }
@@ -55,5 +57,7 @@ public override bool SingleVersionsCompatible(KspVersion gameVersion, CkanModule
 
             return gameVersionRange.IntersectWith(moduleRange) != null;
         }
+
+        private static readonly ILog log = LogManager.GetLogger(typeof(StrictGameComparator));
     }
 }
diff --git a/Netkan/Transformers/AvcTransformer.cs b/Netkan/Transformers/AvcTransformer.cs
@@ -159,7 +159,7 @@ public static void ApplyVersions(JObject json, AvcVersion avc)
                 if (kspMin != null && kspMax != null)
                 {
                     // If we have both a minimum and maximum KSP version...
-                    if (kspMin.CompareTo(kspMax) == 0)
+                    if (kspMin.Equals(kspMax))
                     {
                         // ...and they are equal, then just set ksp_version
                         json["ksp_version"] = kspMin.ToString();