fix(organize): allow merging directories in overlay with metadata differences
Metadata
Current evaluation
Merged as 0797420f, closing #1487. Final review changes tightened overlay directory conflict handling and retained strict errors for metadata mismatches.
Resolution: closed resolved
Reason: PR #1586 was merged as commit 0797420f and explicitly fixes #1487. Follow-up commits d606d55 and 5e6c66f refined the implementation to preserve strict metadata-conflict behavior.
Evaluated by: mr-cal-bot
No scores available.
Issue body
Multiple parts should be able to contribute to the same directory in the overlay partition, even if they have different permissions or ownership. Previously, such differences would trigger a FileOrganizeError during the organization phase.
Fixes: #1487
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged as 0797420f, closing #1487. Final review changes tightened overlay directory conflict handling and retained strict errors for metadata mismatches. | |
| stealth/space-bunny-alpha | — | closed resolved | PR #1586 merged as 0797420f, closing #1487. Final review changes retained strict metadata-conflict errors rather than permitting differing directory permissions or ownership. | |
| qwen/qwen3.6-35b-a3b | — | — | Merged. Resolves #1487 by permitting overlay directories with differing permissions or ownership to merge without raising FileOrganizeError. Review feedback was incorporated via automated commits, CI passed, and the change was successfully merged. |
Update history
No update history recorded yet.
Related work
-
Related To:
canonical/craft-parts#1487
(confidence 100%)
PR #1586 states that it fixes this issue, which was subsequently closed.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #1602 fix(organize): make organize to overlay behavior consistent | craft-parts | merged | Merged as 139cbce6, fixing a regression from #1541: glob-key overlay organization now nests files, while explicit keys continue to merge them. | |
| #1488 Organizing to the overlay directory is not idempotent | craft-parts | closed | Fixed by merged PR #1541 (commit a1178308), making organization into the overlay idempotent so rebuilds no longer fail on existing destination directories. | |
| #1541 fix(organize): make organizing to the overlay idempotent | craft-parts | merged | Merged as commit a1178308: organizing files into the overlay partition is now idempotent, so repeat organization no longer errors on existing destinations. Fixes #1488 (CRAFT-5043); conflicts resolved in merge commit 4282caa6. | |
| #1596 fix(organize): nest overlay directory globs | craft-parts | closed | Overlay directory-glob fix was superseded by merged PR #1602 (commit 139cbce6), which restored consistent nesting for glob keys while explicit keys merge. | |
| #1487 Multiple parts cannot organize to the same directory in the overlay | craft-parts | closed | Fixed by merged PR canonical/craft-parts#1586 (commit 0797420f), allowing wildcard-organized overlay directories from multiple parts to merge despite metadata differences. | |
| #1544 fix: prevent organizing a directory into itself | craft-parts | closed | PR #1544 was closed unmerged as incomplete; the solution was replaced by the organize-from-build rework in #1598 (commit cc02958b). | |
| #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. |