tree 4922812b889d53e9e4cd6ed23db485857025f918
parent 5115016e1b800c814ee423501afa51557d92a185
author Oliver Newman <olivernewman@google.com> 1627337162 +0000
committer CQ Bot <commit-bot@chromium.org> 1627337162 +0000

Revert "[cipd] Include local path in package lock key"

This reverts commit d142747aea5ae43b6fe004dfcebde3e1c6004c67.

Reason for revert: this is failing to roll into recipes (fxrev.dev/560288) so I suspect I broke something.

Original change's description:
> [cipd] Include local path in package lock key
>
> jiri should allow the same package to be included by a manifest multiple
> times at different paths. However, this was previously not always
> possible because jiri only used the name and version of each package to
> compute it unique key when checking for duplicate entries in a lockfile.
> So it was only possible to have the same package at two different paths
> as long as the two were pinned to different versions.
>
> That bug caused failures like this when a package was pinned to the same
> version at two different paths:
> https://ci.chromium.org/b/8841199368556918912
>
> By including the package's local path in the key, we'll no longer
> consider that to be a collision.
>
> Change-Id: I3dde72473f43d6dbcd5cc3565f79e98c88694b64
> Reviewed-on: https://fuchsia-review.googlesource.com/c/jiri/+/560285
> Fuchsia-Auto-Submit: Oliver Newman <olivernewman@google.com>
> Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
> Reviewed-by: Nathan Mulcahey <nmulcahey@google.com>

TBR=haowei@google.com,nmulcahey@google.com,olivernewman@google.com,auto-submit@fuchsia-infra.iam.gserviceaccount.com

Change-Id: Ia272001eff7cfc489e28da13926203702c9fd5d9
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://fuchsia-review.googlesource.com/c/jiri/+/560024
Reviewed-by: Oliver Newman <olivernewman@google.com>
Commit-Queue: Oliver Newman <olivernewman@google.com>