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

Disable -bootstrap-expect flag in dev mode #2464

Merged
merged 1 commit into from
Nov 3, 2016
Merged

Conversation

kyhavlov
Copy link
Contributor

@kyhavlov kyhavlov commented Nov 3, 2016

Fixes the panic described here #2428 (comment) when both -dev and -bootstrap-expect are provided. Expect mode won't do anything in dev mode even with the crash fixed, so it seemed best to just disallow this and provide an error message.

@@ -271,6 +271,12 @@ func (c *Command) readConfig() *Config {
return nil
}

// Expect can only work when dev mode is off
if config.BootstrapExpect > 0 && config.DevMode {
c.Ui.Error("WARNING: Expect mode cannot be enabled when dev mode is enabled")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should drop the "WARNING:" on here, since it's an error, but otherwise LGTM.

Copy link
Contributor

@slackpad slackpad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One tiny thing, otherwise good to go.

@kyhavlov kyhavlov merged commit 1b204eb into master Nov 3, 2016
@kyhavlov kyhavlov deleted the b-dev-expect-panic branch November 3, 2016 05:54
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.

2 participants