← Back to issue list

oci: support file collisions if the files match

View original Github issue

Metadata

Project
rockcraft
Number
#231
Type
pull request
State
merged
Author
tigarmo
Labels
—
Created
Updated
Closed

Current evaluation

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.

Suggested action: —

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
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.
qwen3.6-35b-a3b-mtp-q6 — — Merged. Implements file collision handling in OCI payload layers when files match in attributes and contents, resolving issue #228. Allows Ubuntu packages to function as both overlay and stage packages.

Update history

No update history recorded yet.

Related issues

Issue Project State Summary Similarity
#204 oci: handle duplicate directories because of usrmerge rockcraft merged Merged. Resolves CRAFT-1634 and issue #203 by handling usrmerge duplicate directories in OCI payloads. The fix verifies matching attributes before merging directories into a single layer entry and raises errors for conflicts. Approved, passed CI, and modified six files.
77%
#200 oci: fix handling of subdirs in usrmerge rockcraft merged Merged fix for OCI payload handling where subdirectories were incorrectly placed in symlinked parent directories instead of their targets. Resolved plugin failures for directories like lib/. Approved by reviewers and passed CI checks.
75%