fix(organize): make organize to overlay behavior consistent
Metadata
Current evaluation
Merged fix correcting glob-key organize behavior to overlay. Glob keys previously merged contents instead of nesting. Update restores expected nesting for consistency. Approved by three reviewers and passed CI checks.
Suggested action: —
No scores available.
Issue body
An inconsistency was introduced in commit a1178308 (PR #1541) that caused
glob-key organizing to the overlay merge directory contents instead of
nesting. The expected behavior is to merge when explicit keys are used
and nest when globs are used. Fixed the organize logic to make glob-key
organizing to overlay nest instead of merge to remain consistent with
the results of organizing to other targets.
- [x] Have you followed the guidelines for contributing?
- [x] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)?
- [ ] Have you successfully run `make lint && make test`?
- [ ] Have you added an entry to the changelog (`docs/reference/changelog.rst`)?
---
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | — | Merged fix correcting glob-key organize behavior to overlay. Glob keys previously merged contents instead of nesting. Update restores expected nesting for consistency. Approved by three reviewers and passed CI checks. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged fix correcting glob-key organizing to overlay. Previously merged contents instead of nesting, causing inconsistency. Updated logic to nest glob-key operations, aligning with expected behavior and other targets. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #1596 fix(organize): nest overlay directory globs | craft-parts | closed | Superseded by pull request #1602. The overlay directory glob nesting fix was replaced by a subsequent implementation. | |
| #1201 fix: handle trying to organize a file to itself | craft-parts | merged | Merged fix for glob expansion causing file organization to move a file to itself. Added detection to skip identical paths before shutil.move. Includes refactor and comments for organize_files. Approved by three reviewers and passed all CI checks. | |
| #784 Support globbing for organize | snapcraft | merged | Merged after reviewer approval. Adds globbing support for the organize command, resolving LP: #1616459. Changes include 65 additions and 16 deletions across two files, with minor notes on empty parent directories deferred. | |
| #1586 fix(organize): allow merging directories in overlay with metadata differences | craft-parts | merged | 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. | |
| #1590 inconsistency in organize to overlay | craft-parts | closed | Inconsistent directory organization to overlay partitions was fixed in commit 139cbce6 via PR #1602. The change normalizes overlay handling in organize_files() to ensure consistent nesting for glob keys across all destinations. | |
| #278 docs: add '(overlay)' to the `organize` key description | imagecraft | merged | Merged documentation update adding the overlay pseudo-partition mention to the organize key description. Approved by two reviewers and passed CI checks, clarifying a load-bearing rootfs copy feature. | |
| #1582 docs: correct the 'organize' description | craft-parts | merged | Merged a documentation update correcting the 'organize' description. Approved by two reviewers with a three-line change across one file. Successfully integrated after passing required checks. | |
| #1541 fix(organize): make organizing to the overlay idempotent | craft-parts | merged | Merged to fix overlay organization idempotency and resolve #1488. Copilot automatically resolved merge conflicts in commit 4282caa6, reverting BUILD_PARTITION while preserving OVERLAY_PARTITION logic. All tests pass. |