oci: support file collisions if the files match
Metadata
Current evaluation
Merged PR #231 (commit 5ec8b09f) adding OCI payload-layer support for file collisions when attributes and contents match, e.g. an Ubuntu package used as both overlay-package and stage-package. Fixes #228.
Resolution: closed resolved
Reason: PR #231 was merged into rockcraft as commit 5ec8b09f and the author noted it fixes #228, which is now closed. The change tolerates identical file collisions during layer creation, following the earlier usrmerge directory-collision handling in c3382fc2408.
Evaluated by: mr-cal-bot
No scores available.
Issue body
In c3382fc2408 we added support for directory collisions caused by the usrmerge when creating the payload layer; now we add support for file collisions if the files match in attributes and contents. This scenario can happen if an Ubuntu package is used both as an overlay-package and as a stage-package.
- [ ] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)?
-----
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged PR #231 (commit 5ec8b09f) adding OCI payload-layer support for file collisions when attributes and contents match, e.g. an Ubuntu package used as both overlay-package and stage-package. Fixes #228. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged support for matching file collisions in OCI payload layers, fixing #228 and extending the usrmerge directory-collision handling introduced in c3382fc2408. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged PR #231 (5ec8b09f) resolves #228 by allowing matching file collisions in OCI payload layers, supporting packages used as both overlay and stage packages. | |
| qwen/qwen3.6-35b-a3b | — | — | Merged changes handle file collisions in OCI payload layers when files match in attributes and contents, resolving issue #228. Approved by two reviewers and passing CI, enabling Ubuntu packages to serve as both overlay and stage packages. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged. Implements support for file collisions in OCI payload layers when files match in attributes and contents. Resolves #228 and allows Ubuntu packages to function as both overlay and stage packages. |
Update history
No update history recorded yet.
Related work
-
Duplicate Of:
canonical/rockcraft#228
(confidence 95%)
Underlying bug report: conflicting files with overlay-packages on an Ubuntu base, closed by this PR.
Related issues
No related issues found above the similarity threshold.