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

Fix for unless requisite when pip is not installed #56215

Merged
merged 5 commits into from
Mar 11, 2020

Conversation

dwoz
Copy link
Contributor

@dwoz dwoz commented Feb 20, 2020

What does this PR do?

Fix for #56131

Tests written?

Yes

Commits signed with GPG?

Yes

@dwoz dwoz requested a review from a team as a code owner February 20, 2020 21:08
@ghost ghost requested a review from Akm0d February 20, 2020 21:08
@dwoz dwoz changed the title [WIP] Fix for unless requisite when pip is not installed Fix for unless requisite when pip is not installed Feb 21, 2020
modulec_path = os.path.join(RUNTIME_VARS.CODE_DIR, '__pycache__', 'pip.pyc')
else:
modulec_path = os.path.join(RUNTIME_VARS.CODE_DIR, 'pip.pyc')
print('*' * 80)
Copy link
Contributor

Choose a reason for hiding this comment

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

do we want to keep these prints here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope, will resolve this

@max-arnold
Copy link
Contributor

@dwoz I believe this line should start with if (not or), otherwise it will iterate and delete all modules:

https://github.com/saltstack/salt/blob/1746e6ac60d1b6f9f2d3cb372e043d2aad66fcc0/salt/states/pip_state.py#L54

@Ch3LL Ch3LL added the v3000.1 vulnerable version label Mar 6, 2020
@dwoz
Copy link
Contributor Author

dwoz commented Mar 10, 2020

@dwoz I believe this line should start with if (not or), otherwise it will iterate and delete all modules:

https://github.com/saltstack/salt/blob/1746e6ac60d1b6f9f2d3cb372e043d2aad66fcc0/salt/states/pip_state.py#L54

Good catch, thanks!

@Ch3LL
Copy link
Contributor

Ch3LL commented Mar 11, 2020

looks like there are some lint failures that need to be cleaned up

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v3000.1 vulnerable version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants