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

More complete fix for #31014 #31031

Merged
merged 4 commits into from Feb 9, 2016

Conversation

Projects
None yet
3 participants
@terminalmage
Member

terminalmage commented Feb 9, 2016

This pull request incorporates the partial fix in #31015 and makes it work
properly for dnf as well as yum.

It also resolves a regression in epoch handling that was introduced when
pkg.latest_version was modified to the output from yum list available
instead of using repoquery, which is the root cause of #31014.

Resolves #31014.

gtmanfred and others added some commits Feb 8, 2016

Don't handle epoch specially for dnf
Epoch handling is done in salt.utils.pkg.rpm.parse_pkginfo() now, so
remove special handling for dnf and make both yum and dnf work the same.
@gtmanfred

This comment has been minimized.

Show comment
Hide comment
@gtmanfred

gtmanfred Feb 9, 2016

Member

+1 <3

Member

gtmanfred commented Feb 9, 2016

+1 <3

Fix yumpkg _get_branch_option()
Needs to be returning a list

cachedout added a commit that referenced this pull request Feb 9, 2016

@cachedout cachedout merged commit 071b9d4 into saltstack:2015.8 Feb 9, 2016

5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #13558 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #13240 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #12249 — SUCCESS
Details
jenkins/salt-pr-rs-ubuntu14.04-n Salt PR - RS Ubuntu 14 #9622 — SUCCESS
Details

cachedout added a commit that referenced this pull request Feb 10, 2016

@terminalmage terminalmage deleted the terminalmage:issue31014 branch Apr 6, 2016

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