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

[2018.3] Fix to pkg.installed for sources and hold: True #50333

Conversation

Projects
None yet
6 participants
@garethgreenaway
Copy link
Member

commented Oct 31, 2018

What does this PR do?

pkg.installed currently fails when sources is used along with hold: True. This was due to a change in #48426 that swapped out sending the pkgs variable for the desired variable instead. This caused problems with pkg.hold because desired and sources are always populated, and pkg.hold can only include one or the other. This change just includes desired in the call to pkg.hold since desired has the same value for sources.

What issues does this PR fix or reference?

#50311

Tests written?

No. Existing tests for pkg.hold functions, but including a test to test installing from a source location seems prone to failure.

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

pkg.installed currently fails when sources is used along with hold: T…
…rue. This was due to a change in #48426 that swapped out sending the pkgs variable for the desired variable instead.  This caused problems with pkg.hold because desired and sources are always populated, and pkg.hold can only include one or the other.  This change just includes desired in the call to pkg.hold since desired has the same value for sources.

@salt-jenkins salt-jenkins requested a review from saltstack/team-suse Oct 31, 2018

@garethgreenaway garethgreenaway requested review from terminalmage and Ch3LL and removed request for saltstack/team-suse Oct 31, 2018

@cachedout cachedout requested a review from isbm Nov 1, 2018

@isbm

isbm approved these changes Nov 5, 2018

@Ch3LL

Ch3LL approved these changes Nov 6, 2018

@cachedout cachedout merged commit d9179fb into saltstack:2018.3 Nov 8, 2018

9 of 10 checks passed

jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details

marek-obuchowicz added a commit to spryker/devvm that referenced this pull request Nov 14, 2018

marek-obuchowicz added a commit to spryker/devvm that referenced this pull request Nov 14, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.