WIP: fsrepo: fix musl detection for migrations #3698
Merged
Conversation
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
ghost
added
the
Kubuxu
reviewed
Feb 16, 2017
|
|
||
| test_expect_success "startup fake dists server" ' | ||
| pretend_server > dist_serv_out & | ||
| echo $! > netcat_pid |
There was a problem hiding this comment.
We should have a setp with kill $(cat netcat_pid) || true
whyrusleeping
force-pushed
the
fix/repo-migration-musl
branch
from
2b627e1 to
faa1d75
Compare
|
Thanks @whyrusleeping <3 LGTM with kill suggested by kuba |
The ldd command used for detection doesn't seem to have a --version flag on Alpine Linux. It would print the expected output, but instead of stdout, it would print it on stderr. The musl detection code would only scan stdout for mentions of "musl", and would thus *not* download the musl version of the fs-repo-migrations executable. This manifested in the well-known "fs-repo-migrations: not found" error, which you get when executing something that was linked against a different libc than the one present on the system. License: MIT Signed-off-by: Lars Gierth <[email protected]>
License: MIT Signed-off-by: Jeromy <[email protected]>
Kubuxu
force-pushed
the
fix/repo-migration-musl
branch
from
faa1d75 to
c817f09
Compare
|
Rebsed to master. |
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.
Note: the tests here are totally incomplete, I keep getting stuck :/
If someone else wants to take a look today, that'd be super helpful. The migrations code itself should be good.
The ldd command used for detection doesn't seem to have a
--version flag on Alpine Linux. It would print the expected
output, but instead of stdout, it would print it on stderr.
The musl detection code would only scan stdout for mentions
of "musl", and would thus not download the musl version
of the fs-repo-migrations executable.
This manifested in the well-known "fs-repo-migrations: not found"
error, which you get when executing something that was linked
against a different libc than the one present on the system.
License: MIT
Signed-off-by: Lars Gierth [email protected]