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

[2017.7] Back-port PR 50333 to 2017.7 #50590

Merged
merged 1 commit into from Nov 21, 2018

Conversation

Projects
None yet
3 participants
@garethgreenaway
Copy link
Member

commented Nov 20, 2018

Back-port PR #50333 to 2017.7
#50311

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 Nov 20, 2018

@garethgreenaway garethgreenaway requested a review from saltstack/team-core Nov 20, 2018

@garethgreenaway garethgreenaway changed the title [2017.7] Back-port PR 50333 to 2018.3 [2017.7] Back-port PR 50333 to 2017.7 Nov 20, 2018

@brejoc

brejoc approved these changes Nov 21, 2018

@garethgreenaway garethgreenaway merged commit 6679242 into saltstack:2017.7 Nov 21, 2018

6 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP Ready for review
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-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
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.