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

Fix regression in dynamic pillarenv (bsc#1124277) #123

Merged
merged 1 commit into from Mar 6, 2019

Conversation

dincamihai
Copy link
Contributor

@dincamihai dincamihai commented Feb 8, 2019

Proposed patch for https://bugzilla.novell.com/show_bug.cgi?id=1124277

Upstream code is different (probably because of other backportings): https://github.com/saltstack/salt/blob/2018.3/salt/utils/gitfs.py#L2992-L3019

Just using the upstream implementation of that function doesn't work because it needs some changes to code outside the function. Since it is hard to establish what exactly needs to be ported from upstream, I have decided to produce a patch that fixes the problem we have even though it's not exactly as upstream.

I hope to unify with upstream at a later time.

@dincamihai dincamihai force-pushed the openSUSE-2018.3.0-bsc#1124277 branch 2 times, most recently from 166f614 to 2c623be Compare February 26, 2019 12:42
@dincamihai dincamihai force-pushed the openSUSE-2018.3.0-bsc#1124277 branch from 2c623be to ef1160d Compare March 4, 2019 14:15
@dincamihai dincamihai changed the title [WIP] Fix regression in dynamic pillarenv (bsc#1124277) Fix regression in dynamic pillarenv (bsc#1124277) Mar 4, 2019
@dincamihai dincamihai requested review from meaksh and brejoc March 4, 2019 14:26
Copy link
Member

@brejoc brejoc left a comment

Choose a reason for hiding this comment

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

lgtm

@dincamihai
Copy link
Contributor Author

Thanks!

@dincamihai dincamihai merged commit 3b75126 into openSUSE-2018.3.0 Mar 6, 2019
@SchoolGuy SchoolGuy deleted the openSUSE-2018.3.0-bsc#1124277 branch May 6, 2022 14:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants