Skip to content

Conversation

@nephros
Copy link
Contributor

@nephros nephros commented Jan 18, 2022

See also #220.

This moves the sed call outside of the detection/mangle list loop.
sed command is built in the loop, but only one call to sed is made.

This saves a couple of greps and tests as well.

Tested against Test Case 2-2, from 9fb6adb#diff-bdc16c81678138d1bc10b9ac315b66564aaf85cad91efaed15e375ef837fd7a3

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.

Pretty much what I had in mind (thanks!), except for using sed "streamingly", so the old file is only read once and the new one only written once.
Plus some beautifying.

Please re-review.

@Olf0 Olf0 added this to the 3.2.1 milestone Jan 18, 2022
@Olf0 Olf0 added enhancement this improves something patching related to activating, deactivating and handling Patches labels Jan 18, 2022
@nephros
Copy link
Contributor Author

nephros commented Jan 18, 2022

Please re-review.

Done, Sweet.

I can't click that button to review because I am the PR author, so I'll just hit merge :)

@nephros nephros merged commit bbcee05 into sailfishos-patches:master Jan 18, 2022
@nephros nephros deleted the pm-apply-loop branch January 18, 2022 23:01
@Olf0
Copy link
Contributor

Olf0 commented Jan 18, 2022

I can't click that button to review because I am the PR author,

Yes, that is idiotic logic by the GitHub coders: I also was unable to request a review from you.

so I'll just hit merge :)

Which is fine, because you surely are going to test that once more before the 3.2.1 release, right? 😉

@nephros
Copy link
Contributor Author

nephros commented Jan 19, 2022

Which is fine, because you surely are going to test that once more before the 3.2.1 release, right? 😉

Always.
I only have one 32bit device to test on though.

@b100dian
Copy link
Contributor

b100dian commented Jan 19, 2022

On it - so I test this PRs build?
(L.E. wait, I don't find it, the CI user-interface has changed)

@b100dian
Copy link
Contributor

Works on my machine (return old pulley menu) on 64 bit

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

Labels

enhancement this improves something patching related to activating, deactivating and handling Patches

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Optimise manglelist handling (Was: Fails if a Patch contains multiple sections matching different elements on the manglelist!)

3 participants