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.

Sign up for GitHub

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

Jump to bottom

Merge SLE-15-SP2 #165

Merged
merged 1 commit into from Feb 10, 2021
Merged

Merge SLE-15-SP2 #165

merged 1 commit into from Feb 10, 2021

Conversation

imobachgs
Copy link
Contributor

Merge #164 into master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) to 28.7% when pulling 0a31711 on merge-sle-15-sp2 into 8ea4aba on master.

jreidinger
jreidinger reviewed Feb 10, 2021
View reviewed changes
src/clients/update_proposal.rb
@@ -428,7 +428,9 @@ def init_stuff
# products to reselect after reset
restore = []

Y2Packager::Resolvable.find(kind: :product, status: :selected).each do |product|
# preload the "transact_by" attribute to avoid querying libzypp again (see bsc#1176276)
Y2Packager::Resolvable.find({ kind: :product, status: :selected }, [:transact_by])
Copy link
Member

Choose a reason for hiding this comment

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

@lslezak can you verify that it should go also for master?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I already discussed it with @lslezak. Originally, it was a workaround (which is now properly fixed), but it is safe for master.

@imobachgs imobachgs merged commit 21b255e into master Feb 10, 2021
@imobachgs imobachgs deleted the merge-sle-15-sp2 branch February 10, 2021 15:30
@yast-bot
Copy link
Contributor

✔️ Public Jenkins job #44 successfully finished
✔️ Created OBS submit request #870945

@yast-bot
Copy link
Contributor

✔️ Internal Jenkins job #32 successfully finished
✔️ Created IBS submit request #235686

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

@jreidinger jreidinger jreidinger approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@imobachgs @coveralls @yast-bot @jreidinger