Repository navigation
install: preserve errexit during fork detection - #3
Merged
Merged
Conversation
Use the upstream probe directly as a conditional command so unsupported options follow the existing fallback without changing caller shell options. Inspired by docker#173. Signed-off-by: Su Yang <soulteary@users.noreply.github.com>
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
Owner
Author
|
from docker#173 |
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
1 participant
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.
Summary
Use the exit status of
lsb_release -a -udirectly incheck_forked()instead of temporarily disabling and then unconditionally enablingerrexit.An unsupported
-uoption still enters the existing fallback. A successful probe still resolves the same upstream distribution and codename. The probe now preserves the caller's shell options.Changes
set +e/ saved exit status /set -esequence with a conditional command.Related upstream proposal: docker#173. This is a focused implementation against this fork's current
main.Validation
sh -n,dash -nandbash -npass forinstall.sh.STABLE_LATEST=29.4.2andTEST_LATEST=29.4.2validation values.lsb_release, and Debian fallback, each with callererrexitenabled and disabled.mainimplementation reproduces unwantederrexitenablement in all three shells when the caller has it disabled.git diff --checkpasses.The fixtures exercise the extracted detection function and mocked OS data; they are not installation tests on those distributions. No package installation or service-start test was performed for this control-flow-only change.
Contribution
The commit includes a
Signed-off-bytrailer. This PR targetssoulteary/docker-install:main.A separate branch starts at the current
upsteamcommit and contains only this change: https://github.com/docker/docker-install/compare/master...soulteary:codex/feat/fork-detection-upstream?expand=1 . The comparison is provided for manual upstream submission; no upstream PR was created.