fix: do not collide on "similar" symlinks between overlay and install dir
Metadata
Current evaluation
Merged a fix for symlink collisions between overlay and install directories. The author refactored paths_collide for Rockcraft compatibility. All CI checks passed, reviews were approved, and the change resolved issue #1293.
Suggested action: —
No scores available.
Issue body
- [x] Have you followed the guidelines for contributing?
- [x] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)?
- [x] Have you successfully run `make lint && make test`?
- [x] Have you added an entry to the changelog (`docs/reference/changelog.rst`)?
---
Fixes #1293
CRAFT-4758
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | — | Merged a fix for symlink collisions between overlay and install directories. The author refactored paths_collide for Rockcraft compatibility. All CI checks passed, reviews were approved, and the change resolved issue #1293. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged fix for symlink collision detection between overlay and install directories. Refactored the paths_collide API to maintain Rockcraft compatibility, resolving issue 1293 and CRAFT-4758 after successful testing and CI checks. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #1190 fix(overlay): detect conflicts between overlay and install | craft-parts | merged | Merged fix enhancing Stage step collision detection to account for overlay contents, preventing conflicts with install directories. Includes integration tests, passed all CI checks, and received approval from three reviewers. | |
| #211 oci: fix handling of symlink subdirs | rockcraft | merged | Merged fix to correctly include symlinked subdirectories in Rockcraft OCI tar archives. Contributor implemented the change, reviewer added tests, and the pull request was approved and merged, resolving issue #208. | |
| #1217 Overlay packages fail to copy properly. | rockcraft | closed | A bug in rockcraft 1.19.0 caused overlay packages to fail copying during priming due to symlink handling. The fix was merged in PR #1249 and included in the hotfix/1.19 branch, scheduled for the 1.19.1 release. | |
| #1293 Bad symlink collisions between overlay and build | craft-parts | closed | Closed without a fix. Escalated to internal ticket CRAFT-4758. The issue remains unresolved, as collision detection incorrectly flags equivalent absolute and relative symlinks between overlays and stage packages. |