[Bug] files paths in the patch not always correctly parsed

[robang74]

SailFish OS version: 4.5.0.9
Patchmanger Version: 3.2.9
Hardware: Xperia 10 II

BUG DESCRIPTION

Referring to this patch (untested code):

• https://coderus.openrepos.net/pm2/project/zram-swap-resize-script

this is the output in the log when the patch is installed:

void PatchManagerObject::doRefreshPatchList() Collecting info for:  "zram-swap-resize-script"
void PatchManagerObject::doRefreshPatchList() Possible conflict in:  "/usr/bin/zram_swap_resize.sh"

and this the same when it is not installed:

void PatchManagerObject::doRefreshPatchList() Collecting info for:  "zram-swap-resize-script"
void PatchManagerObject::doRefreshPatchList() Possible conflict in:  "/zram_swap_resize.sh"

in the second case the patch files paths parsing is wrong, unless I created that file which does not exist by default.

STEPS TO REPRODUCE

1. download from Web Catalog the patch above
2. switch the Patch Manager to developer mode
3. then enable and disable the patch
4. check the Patch Manager log

ADDITIONAL INFORMATION

Proposed bug-fix

• f247da6

Let me know and I will do a pull/merge request.

[CODeRUS]

Please take care to fix the code issues reported by this person, but create your own changes. no commits authored by this person are allowed to be merged in this repo.

[CODeRUS]

@nephros @nephros @Olf0 fyi

[Olf0]

@b100dian was missed.

[Olf0]

Please let us carry out this meta-discussion at the oldest bug report filed by robang74: #444

Every thing discussed there an the meta-level is sure applicable to the filed issues #445 and #446, too (plus any future ones by robang74).

[nephros]

I believe this effect has been fixed or at least improved with #476 and possibly later changes.
At least I cannot reproduce reporting of non-existing files in that output with the current version (3.2.12).

While conflict detection certainly is not perfect, it's also relatively harmless as it doesn't actually alter any behaviour of PM, except maybe reporting some patches as having conflicts wrongly.

Closing for now.

[robang74]

I believe this effect has been fixed or at least improved with #476 and possibly later changes.

I love to read the comment of the above commit:

https://github.com/sailfishos-patches/patchmanager/pull/476/files#diff-a612710008f65be4dccd622d30a2f021e61f97d81d31c3b6fed0ffdbd8ff2a9eR1980

Reading this in particular:

                // remove anything left of the slash until we find something that exists.
                // deals with 
                //   +++ patched/usr/foo/bar/...
                //   +++ a/usr/share/...
                // FIXME: what if we find something that exists, but has nothing to do with our patch?
[...]
                // if the loop finishes with no path/file found, it's likely a new file.
                // so just accept whatever's in the patch, but do remove things left of the slash:

It made my day. In particular because I had to see my own proposed contribution (having forgot about this thread after more than a year) in this commit f247da6 in which I was proposing to replace a while with a straighforward approach.

 */             if (!toPatch.startsWith(QChar('/'))) {
                     path = "/" + toPatch.mid(toPatch.indexOf('/', 1));
                 }

In the future, I will refer to PM as an overcomplicate way to deal with a bad system design by people who cannot code and fortunately do it rarely. The only other place in which I saw things like this is an Italian company that was working in automotive industry and has been sold and split like the Hell. They left me a hole pierced in my soul:

• how to report as consultant that working experience in a way to avoid my clients such a way of doing WITHOUT leaking information that would make me appear speaking bad of one of my clients?

This project - finally - supply that lack and fulfil that hole in my soul. Thanks, R-

[nephros]

This project - finally - supply that lack and fulfil that hole in my soul. Thanks, R-

Well, patching is - among other things - about filling holes, so you're welcome.

[robang74]

Well, patching is - among other things - about filling holes, so you're welcome.

Just for your information, it seems that Russians are seeking for those mess-up my collaboration with this project (nowadays abandoned by my side, because it is pretty clear my opinion about that). They are looking for them as much as to send drones over the lake of Como. So, I do not think that it is a joke. You might wonder what's about Como's Lake, but that's another story and now you are on your own (free from Russians investors supposedly but not free from the consequences of how this has been achieved).

Good luck, R-