← Back to issue list

fix(organize): make organizing to the overlay idempotent

View original Github issue

Metadata

Project
craft-parts
Number
#1541
Type
pull request
State
merged
Author
lengau
Labels
—
Created
Updated
Closed

Current evaluation

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.

Resolution: closed resolved

Reason: The PR was merged into main as commit a1178308 and closes craft-parts#1488 ("Organizing to the overlay directory is not idempotent"), which is now marked closed. Later organize/overlay fixes (#1586, #1602) further refined the same overlay conflict handling.

Evaluated by: mr-cal-bot

No scores available.

Issue body

This handles cases where organizing to the overlay could result in errors because you had previously organized to the overlay. Fixes: #1488 CRAFT-5043 - [ ] Have you followed the guidelines for contributing? - [ ] 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 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.
stealth/space-bunny-alpha — closed resolved Merged #1541 in commit a1178308, making organize operations targeting the overlay idempotent and fixing #1488.
qwen/qwen3.6-35b-a3b — — 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.
qwen3.6-35b-a3b-mtp-q6 — — Merged to fix overlay organization idempotency. Conflicts were resolved in commit 4282caa6, reverting BUILD_PARTITION, updating organize.py and tests, and fixing regressions. All 414 tests pass.

Update history

No update history recorded yet.

Related work

  • Likely Fixed By: canonical/craft-parts#1488 (confidence 99%)

    Issue explicitly cited as fixed by this PR and now closed.

  • Related To: canonical/craft-parts#1586 (confidence 65%)

    Follow-up fix (0797420f) relaxing overlay directory merging/metadata conflict handling.

  • Related To: canonical/craft-parts#1602 (confidence 55%)

    Follow-up commit 139cbce6 making organize-to-overlay behavior consistent.

Related issues

Issue Project State Summary Similarity
#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.
84%
#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.
77%
#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.
76%
#1370 fix: make sure the destination does not exist before organizing craft-parts merged Merged PR #1370 as commit 7fe7c84e, removing any existing organize destination before moving files and fixing #1366/CRAFT-4870.
74%
#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.
73%
#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.
71%