Commit b56c9b0
committed
Fix wrong takeover warning direction in hosted/vendor mode
The bug: overlapping_ledger_purls correctly returns the intersection of
ledger claims, but hosted and vendored flows always assumed the current
mode displaced the other without verifying that this run actually
confirmed/rewrote those packages.
Concrete failure: hosted→vendored takeover leaves both ledgers and
lockfile→vendored; a subsequent 'scan --mode hosted --dry-run' (or
hosted run with zero redirects) still reported 'redirect_supersedes_vendored'
and told the user to remove the vendored ledger—the live one.
Fix: Only emit takeover warnings when THIS RUN confirmed those packages:
- Hosted: check if confirmed redirects (packages whose URLs landed in
lockfile) overlap with vendor ledger
- Vendored: check if actually vendored packages (Applied/Rebuilt events)
overlap with redirect ledger
This prevents false-positive warnings on dry-runs and no-op scans where
the lockfile still points at the other mode.1 parent 44df961 commit b56c9b0
2 files changed
Lines changed: 46 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
472 | 472 | | |
473 | 473 | | |
474 | 474 | | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
475 | 479 | | |
476 | | - | |
477 | | - | |
478 | | - | |
479 | | - | |
480 | | - | |
481 | | - | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
| 490 | + | |
| 491 | + | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
| 495 | + | |
| 496 | + | |
482 | 497 | | |
483 | 498 | | |
484 | 499 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
64 | 67 | | |
65 | | - | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
66 | 90 | | |
67 | 91 | | |
68 | 92 | | |
| |||
0 commit comments