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

Remove vcredist 2015 from Py3 installer #48638

Merged
merged 2 commits into from Jul 20, 2018

Conversation

Projects
None yet
4 participants
@twangboy
Contributor

twangboy commented Jul 18, 2018

What does this PR do?

Removes the VC 2015 redistributable from the Py3 Salt installer. Python bundles the needed vcruntime140.dll in the root python directory, so the vcredist installation we've been doing is redundant.

The Py2 installer still needs the VC 2008 redistributable.

What issues does this PR fix or reference?

Related issue in Zendesk 2671 where the vcredist installation was corrupted, poss by the salt installer.

#48592

Tests written?

NA

Commits signed with GPG?

Yes

twangboy added some commits Jul 17, 2018

@twangboy twangboy assigned dwoz and unassigned dwoz Jul 18, 2018

@twangboy twangboy requested review from dwoz and saltstack/team-windows Jul 18, 2018

@damon-atkins

This comment has been minimized.

Member

damon-atkins commented Jul 18, 2018

I think this is the latest version

    "microsoft corporation\\\\microsoft visual c++ 2008 redistributable - x64 9.0.30729.6161\\\\soft": {
        "arch": "x64",
        "vendor": "Microsoft Corporation",
        "version": {
            "9.0.30729.6161": {
                "install_date": "2011-09-11T00:00:00",
                "install_date_time_t": 1315663200,
                "size": 1576,
                "win_advertise_flags": 388,
                "win_display_name": "Microsoft Visual C++ 2008 Redistributable - x64 9.0.30729.6161",
                "win_install_src_dir": "c:\\9dc060fc6db13ee0fa721af59c62\\",
                "win_installer_type": "winmsi",
                "win_instance_type": 0,
                "win_language": "en_US",
                "win_package_code": "{9C7D912C-6EDE-47A4-962E-7A83663440BA}",
                "win_package_name": "vc_red.msi",
                "win_product_code": "{5FCE6D76-F5DC-37AB-B2B8-22AB8CEDB1D4}",
                "win_redeployment_flags": 3,
                "win_uninstall_cmd": "MsiExec.exe /X{5FCE6D76-F5DC-37AB-B2B8-22AB8CEDB1D4}",
                "win_upgrade_code": "{FDA45DDF-8E17-336F-A3ED-356B7B7C688A}",
                "win_version_binary": "9.0.30729",
                "win_version_display": "9.0.30729.6161",
                "win_version_user": "9.0.30729.6161"
            }
        },
        "win_system_component": false,
        "win_version_src": "display-version"
        "win_system_component": false,
        "win_version_src": "display-version"
    },

https://www.microsoft.com/en-au/download/details.aspx?id=26368
https://blogs.msdn.microsoft.com/astebner/2009/01/29/mailbag-how-to-detect-the-presence-of-the-visual-c-9-0-runtime-redistributable-package/

This might be helpfull https://stackoverflow.com/questions/44763052/how-to-get-the-correct-return-value-status-of-vc-2005-in-nsis

@dwoz

dwoz approved these changes Jul 18, 2018

@twangboy

This comment has been minimized.

Contributor

twangboy commented Jul 18, 2018

@damon-atkins That is the version we have been bundling with our Py2 installer.

https://github.com/saltstack/salt/blob/2017.7/pkg/windows/installer/Salt-Minion-Setup.nsi#L221

The problems we have been seeing are related to the VC2015 and since the required dll is already a part of the python3 install, we are no longer including it in the salt install.

@rallytime rallytime merged commit 0c5fff3 into saltstack:2017.7 Jul 20, 2018

3 of 8 checks passed

continuous-integration/jenkins/pr-merge The build of this commit was aborted
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
jenkins/pr/py2-ubuntu-1604 running py2-ubuntu-1604...
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details

@twangboy twangboy deleted the twangboy:fix_vcredist branch Jul 20, 2018

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