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

Pass RBENV_VERSION in env dict, and protect shlex.split #28702

Merged
merged 1 commit into from Nov 11, 2015

Conversation

Projects
None yet
4 participants
@dnd
Contributor

dnd commented Nov 9, 2015

This should fix the behavior of some commands being run with rbenv failing without a default ruby version with "No such file or directory" as described in #23215

@basepi

This comment has been minimized.

Show comment
Hide comment
@basepi

basepi Nov 9, 2015

Collaborator

Thanks @dnd!

Collaborator

basepi commented Nov 9, 2015

Thanks @dnd!

Show outdated Hide outdated salt/modules/rbenv.py Outdated
Show outdated Hide outdated salt/modules/rbenv.py Outdated
@dnd

This comment has been minimized.

Show comment
Hide comment
@dnd

dnd Nov 9, 2015

Contributor

This now depends on #28704 because it uses salt.utils.shlex_split.

Contributor

dnd commented Nov 9, 2015

This now depends on #28704 because it uses salt.utils.shlex_split.

@basepi

This comment has been minimized.

Show comment
Hide comment
@basepi

basepi Nov 11, 2015

Collaborator

Hey @dnd could you please just rebase this so that the test failures due to lack of shlex_split go away? I merged your other pull request.

Collaborator

basepi commented Nov 11, 2015

Hey @dnd could you please just rebase this so that the test failures due to lack of shlex_split go away? I merged your other pull request.

@dnd

This comment has been minimized.

Show comment
Hide comment
@dnd

dnd Nov 11, 2015

Contributor

I forced the push since the history was overwritten, hopefully that's okay since this is just in a pull request.

Contributor

dnd commented Nov 11, 2015

I forced the push since the history was overwritten, hopefully that's okay since this is just in a pull request.

@basepi

This comment has been minimized.

Show comment
Hide comment
@basepi

basepi Nov 11, 2015

Collaborator

Definitely. Pull requests are fine, and you have to use force push after a rebase. Just waiting on tests to finish.

Collaborator

basepi commented Nov 11, 2015

Definitely. Pull requests are fine, and you have to use force push after a rebase. Just waiting on tests to finish.

basepi added a commit that referenced this pull request Nov 11, 2015

Merge pull request #28702 from dnd/rbenv_ruby_version_env
Pass RBENV_VERSION in env dict, and protect shlex.split

@basepi basepi merged commit b75774e into saltstack:develop Nov 11, 2015

3 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #9665 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #11126 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #2196 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #10836 — SUCCESS
Details
@dnd

This comment has been minimized.

Show comment
Hide comment
@dnd

dnd Jan 14, 2016

Contributor

Is this going to make it into the 2015.8 line at all?

Contributor

dnd commented Jan 14, 2016

Is this going to make it into the 2015.8 line at all?

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Jan 14, 2016

Contributor

@dnd I'll mark it for a backport. We'll get it in today.

Contributor

cachedout commented Jan 14, 2016

@dnd I'll mark it for a backport. We'll get it in today.

cachedout added a commit that referenced this pull request Jan 14, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment