fix(Provenance): Fix matches method

oss-review-toolkit · Jun 20, 2024 · d477132 · d477132
1 parent 2acda4d
commit d477132
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/model/src/main/kotlin/Provenance.kt b/model/src/main/kotlin/Provenance.kt
@@ -85,7 +85,12 @@ data class RepositoryProvenance(
      * Return true if this provenance matches the processed VCS information of the [package][pkg].
      */
     override fun matches(pkg: Package): Boolean = vcsInfo == pkg.vcsProcessed
-    override fun matches(other: KnownProvenance): Boolean = other is RepositoryProvenance && vcsInfo == other.vcsInfo
+
+    /**
+     * Return true if this provenance matches the [knownProvenance][other].
+     */
+    override fun matches(other: KnownProvenance): Boolean =
+        other is RepositoryProvenance && other.vcsInfo.normalize().matches(vcsInfo.normalize())
 }
 
 /**

diff --git a/model/src/main/kotlin/VcsInfo.kt b/model/src/main/kotlin/VcsInfo.kt
@@ -83,6 +83,11 @@ data class VcsInfo(
      * Return a [VcsInfoCurationData] with the properties from this [VcsInfo].
      */
     fun toCuration() = VcsInfoCurationData(type, url, revision, path)
+
+    /**
+     * Return true if this vcs information matches the other vcs information.
+     */
+    fun matches(other: VcsInfo) = type == other.type && url == other.url && revision == other.revision
 }
 
 /**