fixup

Author: tomerd

Sources/PackageGraph/PackageGraph+Loading.swift

@@ -255,7 +255,7 @@ private func createResolvedPackages(
                 // check if the resolved package location is the same as the dependency one
                 // if not, this means that the dependencies share the same identity
                 // which only allowed when overriding
-                if resolvedPackage.package.manifest.packageKind.canonicalLocation != dependencyPackageRef.canonicalLocation && !resolvedPackage.allowedToOverride {
+                if resolvedPackage.package.manifest.canonicalPackageLocation != dependencyPackageRef.canonicalLocation && !resolvedPackage.allowedToOverride {
                     let error = PackageGraphError.dependencyAlreadySatisfiedByIdentifier(
                         package: package.identity.description,
                         dependencyLocation: dependencyPackageRef.locationString,

Sources/PackageModel/Manifest.swift

@@ -48,6 +48,11 @@ public final class Manifest {
     /// The repository URL the manifest was loaded from.
     public let packageLocation: String
 
+    /// The canonical repository URL the manifest was loaded from.
+    public var canonicalPackageLocation: CanonicalPackageLocation {
+        CanonicalPackageLocation(self.packageLocation)
+    }
+
     // FIXME: deprecated 2/2021, remove once clients migrate
     @available(*, deprecated, message: "use packageLocation instead")
     public var url: String {

Sources/Workspace/Workspace.swift

@@ -1746,7 +1746,7 @@ extension Workspace {
                     // dependencies that have the same identity but from a different location
                     // which is an error case we diagnose an report about in the GraphLoading part which
                     // is prepared to handle the case where not all manifest are available
-                    $0.packageKind.canonicalLocation == dependency.createPackageRef().canonicalLocation ?
+                    $0.canonicalPackageLocation == dependency.createPackageRef().canonicalLocation ?
                     KeyedPair($0, key: Key(identity: dependency.identity, productFilter: dependency.productFilter)) : nil
                 }
             }