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

[WIP] Add additional required dll's for Windows #36096

Merged
merged 2 commits into from
Sep 13, 2016

Conversation

twangboy
Copy link
Contributor

@twangboy twangboy commented Sep 6, 2016

What does this PR do?

Adds missing DLL's and prereqs for Windows setup.

  • msvcr120.dll
  • libsodium.dll
  • compiled PyYaml for Windows

What issues does this PR fix or reference?

Partial fix for #33848

Previous Behavior

Not being installed if installing with setup.py

New Behavior

Now installs additional files

Tests written?

NA


def run(self):
if getattr(self.distribution, 'salt_installing_pyyaml_windows', None) is None:
print('This command is not meant to be called on it\'s own')
Copy link
Contributor

Choose a reason for hiding this comment

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

its

@cachedout cachedout added the Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged label Sep 7, 2016
@cachedout cachedout merged commit 931486b into saltstack:2015.8 Sep 13, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants