← Back to issue list

refactor: split _check_for_stage_collisions_per_partition

View original Github issue

Metadata

Project
craft-parts
Number
#1186
Type
pull request
State
closed
Author
tigarmo
Labels
—
Created
Updated
Closed

Current evaluation

Closed unmerged; the refactor was superseded by canonical/craft-parts#1188, squash-merged as ef08d620.

Resolution: closed superseded

Reason: PR #1186 was replaced by canonical/craft-parts#1188, which delivered the same split and was squash-merged in commit ef08d620.

Evaluated by: mr-cal-bot

No scores available.

Issue body

The function did both a) gather the files and permissions per part and b) check the sets of files for each part for conflicts. Split the first bit into a separate function, with no behavior changes, so that we can next include the overlay in conflict resolution. - [ ] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)? - [ ] Have you added an entry to the changelog (`docs/reference/changelog.rst`)? -----

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed superseded Closed unmerged; the refactor was superseded by canonical/craft-parts#1188, squash-merged as ef08d620.
stealth/space-bunny-alpha — closed superseded Closed unmerged and superseded by canonical/craft-parts#1188, which delivered the same split and was squash-merged as ef08d620.
stealth/space-bunny-alpha — closed superseded Unmerged refactor PR; superseded by canonical/craft-parts#1188, which delivered the same split and was squash-merged after approvals and passing CI.
qwen/qwen3.6-35b-a3b — — Abandoned and closed without merging due to failing CI tests across multiple environments. The refactor split a collision-checking function to prepare for overlay conflict resolution but received no reviewer feedback.
qwen3.6-35b-a3b-mtp-q6 — — Closed after refactoring to separate file gathering from conflict checking, preparing for overlay integration. No comments or requested changes.

Update history

No update history recorded yet.

Related work

Related issues

Issue Project State Summary Similarity
#1188 refactor: split _check_for_stage_collisions_per_partition craft-parts merged Squash-merged as ef08d620, splitting per-part file and permission collection from collision checks without behavior changes.
90%
#662 feat(executor): check for stage file collisions in each partition craft-parts merged PR #662 by maintainer mr-cal merged as commit 4b28d649, adding check_for_stage_collisions() per-partition staged-file collision detection in craft_parts/executor/collisions.py; fixes #633 (CRAFT-2416). +526/-114 across 8 files.
73%
#633 Check for staged file collisions in each partition craft-parts closed Fixed by PR #662 (merged as commit 4b28d649, CRAFT-2416): check_for_stage_collisions() now iterates over every partition and delegates to _check_for_stage_collisions_per_partition().
72%