Skip to content

rustup-init.sh: Fix unset variable usage#1683

Merged
kinnison merged 1 commit intorust-lang:masterfrom
kinnison:kinnison/fix-unset-var
Mar 6, 2019
Merged

rustup-init.sh: Fix unset variable usage#1683
kinnison merged 1 commit intorust-lang:masterfrom
kinnison:kinnison/fix-unset-var

Conversation

@kinnison
Copy link
Copy Markdown
Contributor

@kinnison kinnison commented Mar 6, 2019

With `set -u` our check for `RUSTUP_UPDATE_ROOT` being empty
needed an additional tweak for it being unset.

Lesson learned from 1.17.0 - even when Daniel thinks he has checked
rustup-init.sh he probably needs to check it again.

/cc @alexcrichton - thanks for the catch.

Fixes #1684

With `set -u` our check for `RUSTUP_UPDATE_ROOT` being empty
needed an additional tweak for it being unset.

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
@kinnison
Copy link
Copy Markdown
Contributor Author

kinnison commented Mar 6, 2019

As an aside, I'd also like to consider if there's any way we can add to at least one of our travis runs, a verification of the at-least-basic behaviour of rustup-init.sh so that clumsy half-asleep release engineers don't miss things like this again :D

@dwijnand
Copy link
Copy Markdown
Contributor

dwijnand commented Mar 6, 2019

Alternatively: #1685.

@tesuji
Copy link
Copy Markdown
Contributor

tesuji commented Mar 6, 2019

This is what I was trying to solve in #1604, but it is not received enough attention from reviewer. So I removed that fix and forgot to open new PR for this problem.

@dwijnand
Copy link
Copy Markdown
Contributor

dwijnand commented Mar 6, 2019

Ah, yes, I see that now. You're right, @lzutao, sorry about that.

@kinnison kinnison merged commit a566dbf into rust-lang:master Mar 6, 2019
@kinnison kinnison deleted the kinnison/fix-unset-var branch March 6, 2019 18:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants