fix: migrate overlay files before running stage or prime (#1617)
Metadata
Current evaluation
Merged as bf3615ca, cherry-picking #1617 so overlay files migrate before stage or prime, preventing build-created directories from shadowing overlay state and breaking priming.
Resolution: closed resolved
Reason: PR #1619 was approved and merged as commit bf3615ca. It ports the overlay migration fix from #1617, resolving priming failures caused by directories shadowing overlay state.
Evaluated by: mr-cal-bot
No scores available.
Issue body
This is a cherry pick of https://github.com/canonical/craft-parts/pull/1617; the only changes were to fix conflicts in the changelog.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged as bf3615ca, cherry-picking #1617 so overlay files migrate before stage or prime, preventing build-created directories from shadowing overlay state and breaking priming. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged craft-parts#1619 (bf3615ca), cherry-picking #1617 to migrate overlay files before stage or prime runs, with changelog conflict fixes. | |
| qwen/qwen3.6-35b-a3b | — | — | Merged cherry-pick of canonical/craft-parts#1617. Resolves changelog conflicts and migrates overlay files before stage or prime execution. Approved by two reviewers and merged following CI validation. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged to fix overlay file migration before stage or prime execution. Cherry-picked from craft-parts#1617, requiring only changelog conflict resolutions. |
Update history
No update history recorded yet.
Related work
-
Related To:
canonical/craft-parts#1617
(confidence 100%)
Original fix merged as 2d81a4bd and cherry-picked by #1619.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #1617 fix: migrate overlay files before running stage or prime | craft-parts | merged | Merged #1617 as 2d81a4bd, moving overlay migration before stage/prime so build-created directories cannot shadow overlay state and break priming; regression coverage was added. | |
| #121 overlay: migrate overlay data to stage and prime (CRAFT-468, CRAFT-82) | craft-parts | merged | Merged PR #121 as d45d7079, moving overlay data into stage/prime, translating whiteouts and opaque directories to OCI, and cleaning shared overlay data. | |
| #1123 fix: Prime content from overlay when split into partitions | craft-parts | merged | Merged PR #1123 (commit 3540e306), fixing overlay priming with partitions by using stage content and migration state while preserving existing prime state files. | |
| #1618 fix: handle dependencies when organizing to overlay | craft-parts | merged | Merged PR #1618 (commit 18239b07) fixes dependency scheduling when organizing to overlay, prioritizing BUILD/organize over dependency STAGE steps and closing #1611. | |
| #1190 fix(overlay): detect conflicts between overlay and install | craft-parts | merged | Merged PR #1190 fixed Stage collision detection by including overlay layer contents and added integration tests for colliding and non-colliding scenarios in commit b7455277. |