fix(extensions): treat an unreadable staged backup as a conflict - #3962
Open
marcelsafin wants to merge 1 commit into
Open
fix(extensions): treat an unreadable staged backup as a conflict#3962marcelsafin wants to merge 1 commit into
marcelsafin wants to merge 1 commit into
Conversation
The rescue-retry loop in install_from_directory() reads each staged backup with bare stat()/read_bytes() calls, so a staged config that cannot be read crashed the reinstall with a raw OSError. Every sibling read in this path — the live twin four lines below, the packaged baseline check, the mode sidecar — already catches OSError. Treat an unreadable staged file like an uncomparable live config: add it to the conflict set so both copies are preserved and the retry aborts with the existing resolution guidance while dest_dir is still untouched. Assisted-by: GitHub Copilot (model: claude-fable-5, autonomous) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Handles unreadable staged extension backups safely during reinstall retries.
Changes:
- Converts staged-file
OSErrorfailures into preserved-config conflicts. - Adds regression coverage verifying both copies remain intact.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
src/specify_cli/extensions/__init__.py |
Handles staged backup read/stat failures. |
tests/test_extensions.py |
Tests unreadable staged backup recovery. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
The rescue-retry loop in
install_from_directory()reads each staged backup with barestat()/read_bytes()calls, so a staged config that cannot be read crashes the reinstall with a rawOSError. Every sibling read in this path — the live twin four lines below, the packaged baseline check, the mode sidecar — already catchesOSError.Fix: treat an unreadable staged file like an uncomparable live config: add it to the conflict set so both copies are preserved and the retry aborts with the existing resolution guidance while
dest_diris still untouched.Testing
uv run specify --helpuv sync && uv run pytest(6,310 passed, 176 skipped)test_retry_with_unreadable_staged_config_aborts_and_preserves_both(fails on main with rawPermissionError, passes with fix)ruff check src testscleanAI Disclosure
Implemented autonomously by GitHub Copilot CLI (model: Claude Fable 5) under human direction; TDD (failing test first), full suite and lint verified locally. Commit includes
Assisted-by/Co-authored-bytrailers.