Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes prompt asking for msvc even though -y is provided #1124

Merged
merged 3 commits into from
May 26, 2017
Merged

fixes prompt asking for msvc even though -y is provided #1124

merged 3 commits into from
May 26, 2017

Conversation

pxdeu
Copy link
Contributor

@pxdeu pxdeu commented May 17, 2017

Fixes #916
no_prompt was simply not being checked

@Diggsey
Copy link
Contributor

Diggsey commented May 21, 2017

@pxdeu Thanks for the PR!

I think in this case, we should still perform the MSVC check, even when -y is passed, but in the event that it fails, just print a warning instead of prompting the user. What do you think?

@pxdeu
Copy link
Contributor Author

pxdeu commented May 21, 2017

Sounds like a good idea. I thought about it when working on the issue. I only decided against it, because it would either slightly change the meaning of the function do_msvc_check (to not include the prompt) or add parameters to it.

Looking at it again, not including the prompt seems to be more in line with the rest of the code and the function is not called elsewhere as far as I can tell.

I can provide a new commit.

@Diggsey
Copy link
Contributor

Diggsey commented May 21, 2017

LGTM @bors r+

@bors
Copy link
Contributor

bors commented May 21, 2017

📌 Commit ef36a24 has been approved by Diggsey

@bors
Copy link
Contributor

bors commented May 21, 2017

⌛ Testing commit ef36a24 with merge 88c7217...

bors added a commit that referenced this pull request May 21, 2017
fixes prompt asking for msvc even though -y is provided

Fixes #916
no_prompt was simply not being checked
@pxdeu
Copy link
Contributor Author

pxdeu commented May 21, 2017

I didn't notice MSVC_MESSAGE was windows only, because I built it on windows.
Glad you have a CI in place to catch things like that.

@Diggsey
Copy link
Contributor

Diggsey commented May 25, 2017

@bors r+

@bors
Copy link
Contributor

bors commented May 25, 2017

📌 Commit b6f105c has been approved by Diggsey

@bors
Copy link
Contributor

bors commented May 25, 2017

⌛ Testing commit b6f105c with merge b0d3242...

bors added a commit that referenced this pull request May 25, 2017
fixes prompt asking for msvc even though -y is provided

Fixes #916
no_prompt was simply not being checked
@bors
Copy link
Contributor

bors commented May 26, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: Diggsey
Pushing b0d3242 to master...

@bors bors merged commit b6f105c into rust-lang:master May 26, 2017
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