Copy remote directories correctly #1207
Merged
Conversation
This file contains 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
Emilgardis
commented
Feb 10, 2023
src/docker/remote.rs
Outdated
Comment on lines
70
to
89
| if let Some((_, rel)) = reldst.rsplit_once('/') { | ||
| if src.is_dir() && src.file_name().unwrap().to_utf8()? == rel { | ||
| eyre::bail!( | ||
| "reldst is pointing to the wrong path: {} -> {}\n{}", | ||
| src.as_posix_relative()?, | ||
| reldst, | ||
| std::panic::Location::caller() | ||
| ); | ||
| } | ||
| } |
There was a problem hiding this comment.
this should be behind CROSS_DEBUG
src/docker/remote.rs
Outdated
| dirs.cargo(), | ||
| reldst | ||
| .rsplit_once('/') | ||
| .ok_or_else(|| eyre::eyre!("cargo can't be a root directory"))? |
There was a problem hiding this comment.
Suggested change
| .ok_or_else(|| eyre::eyre!("cargo can't be a root directory"))? | |
| .ok_or_else(|| eyre::eyre!("can not be a root directory"))? |
src/docker/remote.rs
Outdated
| dirs.xargo(), | ||
| reldst | ||
| .rsplit_once('/') | ||
| .ok_or_else(|| eyre::eyre!("cargo can't be a root directory"))? |
There was a problem hiding this comment.
Suggested change
| .ok_or_else(|| eyre::eyre!("cargo can't be a root directory"))? | |
| .ok_or_else(|| eyre::eyre!("can not be a root directory"))? |
|
bors try --none |
|
I want to add a test for this, but it's hard to imagine what a good test would look like. |
tryBuild succeeded: |
Emilgardis
changed the title
.cargo and .xargo correctly
Co-authored-by: josh-bpl <124796608+josh-bpl@users.noreply.github.com>
|
I think the test can be part of the larger testing infra work merging this as it has been confirmed to work now bors r+ |
|
Build failed: |
Emilgardis
added
the
no-ci-targets
|
bors retry |
|
Build succeeded: |
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.
resolves #1206