fix(organize): make organize to overlay behavior consistent
Metadata
Current evaluation
Merged as 139cbce6, fixing a regression from #1541: glob-key overlay organization now nests files, while explicit keys continue to merge them.
Resolution: closed resolved
Reason: PR #1602 was approved and merged as commit 139cbce6. It restores consistent overlay behavior by nesting glob-key output and merging explicit-key output.
Evaluated by: mr-cal-bot
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 |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged as 139cbce6, fixing a regression from #1541: glob-key overlay organization now nests files, while explicit keys continue to merge them. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged as 139cbce6, fixing overlay organization so glob keys nest consistently; explicit keys still merge, reversing the regression from a1178308 (#1541). | |
| stealth/space-bunny-alpha | — | closed resolved | Merged in 139cbce6 (#1602), restoring overlay organize behavior: glob keys nest while explicit keys merge, fixing the regression introduced by #1541. | |
| 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 work
-
Caused By:
canonical/craft-parts#1541
(confidence 100%)
PR #1602 identifies #1541 and commit a1178308 as introducing the inconsistent overlay behavior.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #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. | |
| #1590 inconsistency in organize to overlay | craft-parts | closed | Maintainer-filed report of inconsistent overlay organize (MERGE vs NEST) was fixed by PR #1602, merged as commit 139cbce6, making glob keys always nest and explicit keys merge. | |
| #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. | |
| #1586 fix(organize): allow merging directories in overlay with metadata differences | craft-parts | merged | Merged as 0797420f, closing #1487. Final review changes tightened overlay directory conflict handling and retained strict errors for metadata mismatches. | |
| #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. |