Fix x.py install not working with relative prefix #80797
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
rustbot
added
beta-nominated
rust-highfive
added
the
S-waiting-on-review
|
cc @cuviper as well, for a double-check from someone with distro experience. I really don't want to screw things here. |
|
The installer script appears to support |
|
Actually, I'm not sure that |
jyn514
added
the
T-bootstrap
|
Using your branch, I now see binaries, rlibs etc under the install prefix :) |
| // directory. To prevent relative paths from breaking this converts relative paths to absolute | ||
| // paths. std::fs::canonicalize is not used as that requires the path to actually be present. | ||
| if path.is_relative() { | ||
| path = std::env::current_dir().expect("failed to get the current directory").join(path); |
There was a problem hiding this comment.
I think current_dir might be confusing here. I would expect it to be config.toml relative probably? I've never used install with relative paths though, and it seems fine to leave this up to future PRs to figure out. It's likely to not be entirely wrong at least.
|
@bors r+ |
|
📌 Commit 2caf9bc has been approved by |
bors
added
S-waiting-on-bors
Mark-Simulacrum
added
the
beta-accepted
|
☀️ Test successful - checks-actions |
Mark-Simulacrum
removed
the
beta-nominated
Merged
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 20, 2021
…ulacrum [beta] backports This backports: * Update RLS and Rustfmt rust-lang#81027 * bump rustfmt to v1.4.32 rust-lang#81093 * Fix handling of malicious Readers in read_to_end rust-lang#80895 * Fix broken ./x.py install rust-lang#80514 * Fix x.py install not working with relative prefix rust-lang#80797 * [security] Update mdbook rust-lang#80688 * rustdoc: Render visibilities succinctly rust-lang#80368 r? `@ghost`
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Feb 11, 2021
…r=Mark-Simulacrum bootstrap: fix wrong docs installation path This PR fixes rust-lang#81967, a regression introduced by rust-lang#80797. The commit has already been backported to stable 1.50.0. r? `@Mark-Simulacrum`
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Feb 11, 2021
…r=Mark-Simulacrum bootstrap: fix wrong docs installation path This PR fixes rust-lang#81967, a regression introduced by rust-lang#80797. The commit has already been backported to stable 1.50.0. r? ``@Mark-Simulacrum``
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Feb 11, 2021
…r=Mark-Simulacrum bootstrap: fix wrong docs installation path This PR fixes rust-lang#81967, a regression introduced by rust-lang#80797. The commit has already been backported to stable 1.50.0. r? ````@Mark-Simulacrum````
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Feb 12, 2021
…r=Mark-Simulacrum bootstrap: fix wrong docs installation path This PR fixes rust-lang#81967, a regression introduced by rust-lang#80797. The commit has already been backported to stable 1.50.0. r? `````@Mark-Simulacrum`````
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Feb 12, 2021
…r=Mark-Simulacrum bootstrap: fix wrong docs installation path This PR fixes rust-lang#81967, a regression introduced by rust-lang#80797. The commit has already been backported to stable 1.50.0. r? ``````@Mark-Simulacrum``````
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.
The code powering
./x.py installdid not handle relative paths well: the installation script is executed inside a temporary directory, so all the relative paths specified inconfig.tomland in theDESTDIRenvironment variable were relative to that temporary directory. The original code fixed the problem forconfig.tomlpaths by canonicalizing the prefix, but breakingDESTDIR. #80240 fixed theDESTDIRproblem, but also regressedconfig.tomlpaths (#80683).This PR refactors the installation code to generate paths that in my understanding are correct, adding comments in the meantime to explain what each step does. There was no documentation on why choices were made before, so my understanding could actually be wrong.
Regardless, executed
./x.py installwith various combinations ofconfig.tomlandDESTDIRpaths, and everything seems to work according to my understanding. Still, I'd love if @vext01 and @yshui could test these changes.r? @Mark-Simulacrum
@rustbot modify labels: beta-nominated T-infra