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 #426 #428

Merged
merged 3 commits into from
Apr 19, 2023
Merged

Fix #426 #428

merged 3 commits into from
Apr 19, 2023

Conversation

nephros
Copy link
Contributor

@nephros nephros commented Apr 15, 2023

See linked issue #426

nephros added 2 commits April 15, 2023 15:14
- about possible conflicts
- some file handling
@nephros nephros requested a review from b100dian April 15, 2023 14:04
@nephros nephros linked an issue Apr 15, 2023 that may be closed by this pull request
@nephros
Copy link
Contributor Author

nephros commented Apr 15, 2023

Confirmed working here

Copy link
Contributor

@Olf0 Olf0 left a comment

Choose a reason for hiding this comment

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

Besides my attempts of QS of the three specific code locations, this is LGTM, but as it is C++ code, I would also like to have @b100dian taking a look at it. If he cannot spare the time within a week or so, I will approve to avoid stalling this bug fix.

Copy link
Contributor

@b100dian b100dian left a comment

Choose a reason for hiding this comment

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

Great job finding the culprit! And thanks for adding / clarifying the log messages too.

@nephros nephros merged commit 1ff36ac into sailfishos-patches:master Apr 19, 2023
@nephros nephros deleted the fix-426 branch April 19, 2023 16:53
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.

[Bug] 64-bit-mangled patches sometimes fail to apply
3 participants