[Bug] 64bit succeeds but applies 32bit patch

[ichthyosaurus]

This bug report is just a placeholder to track a bug discussed in the forum: https://forum.sailfishos.org/t/patches-by-ichthyosaurus/15387/119

The color emoji patch fails to apply on 64bit devices running SFOS >= 4.6 because 64bit mangling succeeds but PM still applies the 32bit code.

[nephros]

Thanks for reporting. I've been trying to pin this down but so far haven't found the reason.
Will keep on it.

[nephros]

Output of the patching process on my (64bit) C2:

----------------------------------
pm_apply 2024-11-26T13:22:11+01:00
----------------------------------

sfos-patch-keyboard-color-stock-emojis

Using patch file: /usr/share/patchmanager/patches/sfos-patch-keyboard-color-stock-emojis/unified_diff.patch

----------------------------------
Checking paths for 64-bit --> 32-bit conversion
----------------------------------

Mangle candidates: /usr/lib/qt5/qml /usr/lib/jolla-mediaplayer /usr/lib/maliit/plugins

Converting library path reference /usr/lib/qt5/qml 2 times

OK, converted 2 library path references and created: /tmp/patchmanager3/patches/sfos-patch-keyboard-color-stock-emojis/unified_diff_64bit.patch


----------------------------------
Test if already applied patch
----------------------------------

The next patch, when reversed, would delete the file usr/lib64/qt5/qml/com/jolla/keyboard/ichthyo_color_emojis/EmojiSearch.qml,
which does not exist!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file usr/lib64/qt5/qml/com/jolla/keyboard/ichthyo_color_emojis/qmldir,
which does not exist!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
checking file usr/share/maliit/plugins/com/jolla/HorizontalPredictionListView.qml
Unreversed patch detected!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
5 out of 5 hunks ignored
checking file usr/share/maliit/plugins/com/jolla/PasteInputHandler.qml
Unreversed patch detected!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
3 out of 3 hunks ignored
checking file usr/share/maliit/plugins/com/jolla/Popper.qml
Unreversed patch detected!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
10 out of 10 hunks ignored
checking file usr/share/maliit/plugins/com/jolla/PopperCell.qml
Unreversed patch detected!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
3 out of 3 hunks ignored
The next patch, when reversed, would delete the file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiConfig.qml,
which does not exist!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiConfigLabel.qml,
which does not exist!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiConfigOverlay.qml,
which does not exist!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiGroupKey.qml,
which does not exist!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiKey.qml,
which does not exist!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiPlaceholder.qml,
which does not exist!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/KeyboardRestarter.qml,
which does not exist!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji.js,
which does not exist!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data.js,
which does not exist!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data_de.js,
which does not exist!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data_es.js,
which does not exist!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data_fr.js,
which does not exist!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data_nb.js,
which does not exist!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data_sv.js,
which does not exist!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch, when reversed, would delete the file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/qmldir,
which does not exist!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
checking file usr/share/maliit/plugins/com/jolla/layouts/emojis.qml
Unreversed patch detected!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
checking file usr/share/maliit/plugins/com/jolla/layouts/layouts_emojis.conf
Unreversed patch detected!  Ignore -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored

----------------------------------
Dry running patch file
----------------------------------

checking file usr/lib/qt5/qml/com/jolla/keyboard/ichthyo_color_emojis/EmojiSearch.qml
checking file usr/lib/qt5/qml/com/jolla/keyboard/ichthyo_color_emojis/qmldir
checking file usr/share/maliit/plugins/com/jolla/HorizontalPredictionListView.qml
checking file usr/share/maliit/plugins/com/jolla/PasteInputHandler.qml
checking file usr/share/maliit/plugins/com/jolla/Popper.qml
checking file usr/share/maliit/plugins/com/jolla/PopperCell.qml
checking file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiConfig.qml
checking file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiConfigLabel.qml
checking file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiConfigOverlay.qml
checking file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiGroupKey.qml
checking file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiKey.qml
checking file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiPlaceholder.qml
checking file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/KeyboardRestarter.qml
checking file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji.js
checking file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data.js
checking file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data_de.js
checking file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data_es.js
checking file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data_fr.js
checking file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data_nb.js
checking file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data_sv.js
checking file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/qmldir
checking file usr/share/maliit/plugins/com/jolla/layouts/emojis.qml
checking file usr/share/maliit/plugins/com/jolla/layouts/layouts_emojis.conf

----------------------------------
Applying patch file
----------------------------------

patching file usr/lib/qt5/qml/com/jolla/keyboard/ichthyo_color_emojis/EmojiSearch.qml
patching file usr/lib/qt5/qml/com/jolla/keyboard/ichthyo_color_emojis/qmldir
patching file usr/share/maliit/plugins/com/jolla/HorizontalPredictionListView.qml
patching file usr/share/maliit/plugins/com/jolla/PasteInputHandler.qml
patching file usr/share/maliit/plugins/com/jolla/Popper.qml
patching file usr/share/maliit/plugins/com/jolla/PopperCell.qml
patching file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiConfig.qml
patching file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiConfigLabel.qml
patching file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiConfigOverlay.qml
patching file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiGroupKey.qml
patching file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiKey.qml
patching file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/EmojiPlaceholder.qml
patching file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/KeyboardRestarter.qml
patching file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji.js
patching file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data.js
patching file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data_de.js
patching file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data_es.js
patching file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data_fr.js
patching file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data_nb.js
patching file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/emoji_data_sv.js
patching file usr/share/maliit/plugins/com/jolla/ichthyo_color_emojis/qmldir
patching file usr/share/maliit/plugins/com/jolla/layouts/emojis.qml
patching file usr/share/maliit/plugins/com/jolla/layouts/layouts_emojis.conf

----------------------------------
Creating backup of patch file
----------------------------------

Created backup: /tmp/patchmanager3/patches/sfos-patch-keyboard-color-stock-emojis


*** SUCCESS ***

[nephros]

Note that:

1. 64bit mangling succeeds and creates a correct patch
2. "check if already applied" used 64bit paths
3. dry-run and apply use 32bit paths

BUT that could just be the patch program using the --- lines instead of the +++ ones when run in reverse mode (-R).

[nephros]

After patching, the temp dir contains:

# find /tmp/patchmanager/usr/lib/
/tmp/patchmanager/usr/lib/
/tmp/patchmanager/usr/lib/qt5
/tmp/patchmanager/usr/lib/qt5/qml
/tmp/patchmanager/usr/lib/qt5/qml/com
/tmp/patchmanager/usr/lib/qt5/qml/com/jolla
/tmp/patchmanager/usr/lib/qt5/qml/com/jolla/keyboard
/tmp/patchmanager/usr/lib/qt5/qml/com/jolla/keyboard/ichthyo_color_emojis
/tmp/patchmanager/usr/lib/qt5/qml/com/jolla/keyboard/ichthyo_color_emojis/qmldir
/tmp/patchmanager/usr/lib/qt5/qml/com/jolla/keyboard/ichthyo_color_emojis/EmojiSearch.qml

the real filesystem has:

/usr/lib/qt5/qml/com/jolla/keyboard/ichthyo_color_emojis/:
total 8
-rw-r--r--    1 root     root           267 Nov 26 13:36 EmojiSearch.qml
-rw-r--r--    1 root     root            89 Nov 26 13:36 qmldir

... with /usr/lib/qt5 being a symlink:

 $ ls /usr/lib/q* -lad
lrwxrwxrwx    1 root     root            29 Nov 26 13:22 /usr/lib/qt5 -> /tmp/patchmanager/usr/lib/qt5

[nephros]

Also, the emoji patch is a bit unusual in that it has

--- /dev/null
+++ b/usr/lib/...

i.e. a "git-style" method of creating a new file, as opposed to "diff -Naur" which uses the full file path.

[nephros]

I believe the issue is caused by the fact that a new file is being created, including a new path, as opposed to the more common case of existing stuff being modified, and our "mangling", or the section that follows later, doesn't deal with that case.

I.e. something in this mess:

patchmanager/src/bin/patchmanager-daemon/patchmanagerobject.cpp

Lines 1904 to 1960 in f2635ec

	m_patchFiles.clear();
	m_fileToPatch.clear();
	QMap<QString, QStringList> filesConflicts;
	QDir patchesDir(PATCHES_DIR);
	for (const QString &patchFolder : patchesDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
	QFile patchFile(QStringLiteral("%1/%2/unified_diff.patch").arg(PATCHES_DIR, patchFolder));
	if (!patchFile.exists() || !patchFile.open(QFile::ReadOnly)) {
	qWarning() << Q_FUNC_INFO << "Could not read diff file for: " << patchFolder;
	continue;
	}
	qDebug() << Q_FUNC_INFO << "Collecting info for: " << patchFolder;
	while (!patchFile.atEnd()) {
	const QByteArray line = patchFile.readLine();
	if (line.startsWith(QByteArrayLiteral("+++ "))) {
	const QString toPatch = QString::fromLatin1(line.split(' ')[1].split('\t')[0].split('\n')[0]);
	QString path = toPatch;
	for (int i = 0; i < toManglePaths.size(); i++) {
	// we need to deal with either absolute, or "git-style" beginnings, see #426:
	QString checkpath = path.mid(path.indexOf('/', 0));
	if (checkpath.startsWith(toManglePaths[i])) {
	qDebug() << Q_FUNC_INFO << "Mangle: Editing path: " << path;
	path.replace(toManglePaths[i], mangledPaths[i]);
	qDebug() << Q_FUNC_INFO << "Mangle: Edited path: " << path;
	}
	}
	while (!QFileInfo::exists(path) && path.count('/') > 1) {
	path = path.mid(path.indexOf('/', 1));
	}
	if (!QFileInfo::exists(path)) {
	if (toPatch.startsWith(QChar('/'))) {
	path = toPatch;
	} else {
	path = toPatch.mid(toPatch.indexOf('/', 1));
	}
	}
	if (!filesConflicts[path].contains(patchFolder)) {
	qDebug() << Q_FUNC_INFO << "Possible conflict in: " << path;
	filesConflicts[path].append(patchFolder);
	}
	QStringList patchFiles = m_patchFiles[patchFolder];
	if (!patchFiles.contains(path)) {
	patchFiles.append(path);
	}
	m_patchFiles[patchFolder] = patchFiles;
	QStringList fileToPatch = m_fileToPatch[path];
	if (!fileToPatch.contains(patchFolder)) {
	fileToPatch.append(patchFolder);
	}
	m_fileToPatch[path] = fileToPatch;
	}
	}
	patchFile.close();

... and/or in the methods setting up the "fakeroot", i.e. PatchManagerObject::tryToLinkFakeParent, PatchManagerObject::checkIsFakeLinked etc.

[nephros]

Also note that after unapplying, we leave a dangling symlink:

root@PGJollaC2:/home/nemo # ls -lad  /usr/lib/q*
lrwxrwxrwx    1 root     root            29 Nov 26 13:22 /usr/lib/qt5 -> /tmp/patchmanager/usr/lib/qt5
root@PGJollaC2:/home/nemo # ls -l /tmp/patchmanager/usr/lib/qt5
ls: /tmp/patchmanager/usr/lib/qt5: No such file or directory

... and the daemon spits out these:

Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: bool PatchManagerObject::tryToUnlinkFakeParent(const QString&) Failed when trying to change (cd) from directory "/usr/lib" to "qt5"
Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: bool PatchManagerObject::tryToUnlinkFakeParent(const QString&) Failed when trying to change (cd) from directory "/usr/lib" to "qt5"
Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: bool PatchManagerObject::tryToUnlinkFakeParent(const QString&) Failed when trying to change (cd) from directory "/usr/share/maliit/plugins/com/jolla" to "ichthyo_color_emojis"
Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: bool PatchManagerObject::tryToUnlinkFakeParent(const QString&) Failed when trying to change (cd) from directory "/usr/share/maliit/plugins/com/jolla" to "ichthyo_color_emojis"
Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: bool PatchManagerObject::tryToUnlinkFakeParent(const QString&) Failed when trying to change (cd) from directory "/usr/share/maliit/plugins/com/jolla" to "ichthyo_color_emojis"
Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: bool PatchManagerObject::tryToUnlinkFakeParent(const QString&) Failed when trying to change (cd) from directory "/usr/share/maliit/plugins/com/jolla" to "ichthyo_color_emojis"
Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: bool PatchManagerObject::tryToUnlinkFakeParent(const QString&) Failed when trying to change (cd) from directory "/usr/share/maliit/plugins/com/jolla" to "ichthyo_color_emojis"
Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: bool PatchManagerObject::tryToUnlinkFakeParent(const QString&) Failed when trying to change (cd) from directory "/usr/share/maliit/plugins/com/jolla" to "ichthyo_color_emojis"
Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: bool PatchManagerObject::tryToUnlinkFakeParent(const QString&) Failed when trying to change (cd) from directory "/usr/share/maliit/plugins/com/jolla" to "ichthyo_color_emojis"
Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: bool PatchManagerObject::tryToUnlinkFakeParent(const QString&) Failed when trying to change (cd) from directory "/usr/share/maliit/plugins/com/jolla" to "ichthyo_color_emojis"
Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: bool PatchManagerObject::tryToUnlinkFakeParent(const QString&) Failed when trying to change (cd) from directory "/usr/share/maliit/plugins/com/jolla" to "ichthyo_color_emojis"
Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: bool PatchManagerObject::tryToUnlinkFakeParent(const QString&) Failed when trying to change (cd) from directory "/usr/share/maliit/plugins/com/jolla" to "ichthyo_color_emojis"
Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: bool PatchManagerObject::tryToUnlinkFakeParent(const QString&) Failed when trying to change (cd) from directory "/usr/share/maliit/plugins/com/jolla" to "ichthyo_color_emojis"
Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: bool PatchManagerObject::tryToUnlinkFakeParent(const QString&) Failed when trying to change (cd) from directory "/usr/share/maliit/plugins/com/jolla" to "ichthyo_color_emojis"
Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: bool PatchManagerObject::tryToUnlinkFakeParent(const QString&) Failed when trying to change (cd) from directory "/usr/share/maliit/plugins/com/jolla" to "ichthyo_color_emojis"
Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: bool PatchManagerObject::tryToUnlinkFakeParent(const QString&) Failed when trying to change (cd) from directory "/usr/share/maliit/plugins/com/jolla" to "ichthyo_color_emojis"
Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: bool PatchManagerObject::tryToUnlinkFakeParent(const QString&) Failed when trying to change (cd) from directory "/usr/share/maliit/plugins/com/jolla" to "ichthyo_color_emojis"
Nov 26 14:37:01 PGJollaC2 patchmanager[1479]: void PatchManagerObject::doPatch(const QVariantMap&, const QDBusMessage&, bool) Sending reply.

[nephros]

Indeed,

doPatch()

patchmanager/src/bin/patchmanager-daemon/patchmanagerobject.cpp

Lines 2096 to 2116 in f2635ec

	bool PatchManagerObject::doPatch(const QString &patchName, bool apply, QString *patchLog)
	{
	qDebug() << Q_FUNC_INFO << patchName << apply;
	if (apply) {
	doPrepareCache(patchName, apply);
	}
	QProcess process;
	process.setProgram(apply ? PM_APPLY : PM_UNAPPLY);
	QStringList arguments;
	arguments.append(patchName);
	if (false == getSettings(QStringLiteral("bitnessMangle"), false).toBool()) {
	QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
	qDebug() << Q_FUNC_INFO << "DISABLE_MANGLING=true";
	env.insert("DISABLE_MANGLING", "true");
	process.setProcessEnvironment(env);
	}

calls doPrepareCache() before the bitness mangling takes place.

[nephros]

Debugging output from the test case "pm-test-case-add-a-file-git-style" (from PR #475):

Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: bool PatchManagerObject::putSettings(const QString&, const QVariant&) "order" QVariant(QStringList, ("patch-glass-everywhere", "patch-glass-covers", "patch-glass-handles", "patch-glass-buttons", "patch-glass-popups", "patc
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: QVariant PatchManagerObject::getSettings(const QString&, const QVariant&) const "sfosVersionCheck" QVariant(int, 0) QVariant(QString, "1")
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: QVariantMap PatchManagerObject::applyPatch(const QString&) "pm-test-case-add-a-file-git-style"
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: void PatchManagerObject::doPatch(const QVariantMap&, const QDBusMessage&, bool) QMap(("name", QVariant(QString, "pm-test-case-add-a-file-git-style"))("user_request", QVariant(bool, true))) true
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: bool PatchManagerObject::doPatch(const QString&, bool, QString*) "pm-test-case-add-a-file-git-style" true
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: void PatchManagerObject::doPrepareCache(const QString&, bool) "pm-test-case-add-a-file-git-style" true
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: void PatchManagerObject::doPrepareCache(const QString&, bool) Patch changes the following files:
                                                 "/usr/lib/qt5/qml/org/SfietKonstantin/patchmanagertests/post-existing-file"
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: void PatchManagerObject::doPrepareCache(const QString&, bool) Processing file "/usr/lib/qt5/qml/org/SfietKonstantin/patchmanagertests/post-existing-file"
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: void PatchManagerObject::doPrepareCache(const QString&, bool) Creating faking directory "/tmp/patchmanager/usr/lib/qt5/qml/org/SfietKonstantin/patchmanagertests"
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: bool PatchManagerObject::checkIsFakeLinked(const QString&) "/usr/lib/qt5/qml/org/SfietKonstantin/patchmanagertests"
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: bool PatchManagerObject::checkIsFakeLinked(const QString&) "/usr/lib/qt5/qml/org/SfietKonstantin/patchmanagertests" already has a faking symlink "/usr/lib/qt5"
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: QVariant PatchManagerObject::getSettings(const QString&, const QVariant&) const "bitnessMangle" QVariant(bool, false) QVariant(QString, "true")
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: bool PatchManagerObject::doPatch(const QString&, bool, QString*) Starting "/usr/libexec/pm_apply" ("pm-test-case-add-a-file-git-style")
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: bool PatchManagerObject::doPatch(const QString&, bool, QString*) Successfully started process (bool): true
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: bool PatchManagerObject::doPatch(const QString&, bool, QString*)
                                               Using patch file: /usr/share/patchmanager/patches/pm-test-case-add-a-file-git-style/unified_diff.patch
                                               OK, converted 1 library path references and created: /tmp/patchmanager3/patches/pm-test-case-add-a-file-git-style/unified_diff_64bit.patch
                                               The next patch, when reversed, would delete the file usr/lib64/qt5/qml/org/SfietKonstantin/patchmanagertests/post-existing-file,
                                               checking file usr/lib/qt5/qml/org/SfietKonstantin/patchmanagertests/post-existing-file
                                               patching file usr/lib/qt5/qml/org/SfietKonstantin/patchmanagertests/post-existing-file
                                               Created backup: /tmp/patchmanager3/patches/pm-test-case-add-a-file-git-style
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: void PatchManagerObject::doPatch(const QVariantMap&, const QDBusMessage&, bool) OK (bool): true
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: bool PatchManagerObject::putSettings(const QString&, const QVariant&) "applied" QVariant(QStringList, ("patch-sandbox-indicator", "patch-icon-filter", "android-settings", "patch-email-headers", "patch-partnerspace-blur", "
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: void PatchManagerObject::refreshPatchList()
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: void PatchManagerObject::patchToggleService(const QString&) "pm-test-case-add-a-file-git-style"
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: QVariant PatchManagerObject::getSettings(const QString&, const QVariant&) const "notifyOnSuccess" QVariant(bool, true) QVariant(QString, "false")
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: void PatchManagerObject::doPatch(const QVariantMap&, const QDBusMessage&, bool) Sending reply.
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: void PatchManagerObject::doRefreshPatchList()
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: QVariant PatchManagerObject::getSettings(const QString&, const QVariant&) const "bitnessMangle" QVariant(bool, false) QVariant(QString, "true")
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: void PatchManagerObject::doRefreshPatchList() toManglePaths ("/usr/lib/qt5/qml", "/usr/lib/jolla-mediaplayer", "/usr/lib/maliit/plugins")
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: void PatchManagerObject::doRefreshPatchList() mangledPaths ("/usr/lib64/qt5/qml", "/usr/lib64/jolla-mediaplayer", "/usr/lib64/maliit/plugins")
Nov 26 16:33:35 PGJollaC2 patchmanager[26686]: QVariant PatchManagerObject::getSettings(const QString&, const QVariant&) const "applied" QVariant(QStringList, ()) QVariant(QStringList, ("patch-sandbox-indicator", "patch-icon-filter", "android-settings", "patch-email-he
N

[nephros]

Huh. It seems the following fix the issue.

However, it's very inefficient, and I'm not convinced it's the correct way to do it.
But it's a start.

• d6ddd32
• 67e600d
• 80347f2

Marked as tag https://github.com/nephros/patchmanager/releases/tag/fix-468-1

[nephros]

OK I think the bug is in this section:

patchmanager/src/bin/patchmanager-daemon/patchmanagerobject.cpp

Lines 1931 to 1940 in ee4254c

	while (!QFileInfo::exists(path) && path.count('/') > 1) {
	path = path.mid(path.indexOf('/', 1));
	}
	if (!QFileInfo::exists(path)) {
	if (toPatch.startsWith(QChar('/'))) {
	path = toPatch;
	} else {
	path = toPatch.mid(toPatch.indexOf('/', 1));
	}
	}

while (!QFileInfo::exists(path) && path.count('/') > 1) {
    path = path.mid(path.indexOf('/', 1));
}

This tries to find existing files, chopping off stuff from the left of the path. It is to deal with the cases that patch lines might be either of:

+++ /usr/lib
+++ b/usr/lib
+++ my-patch/usr/lib

and it will even accept

+++ /path/to/my-patch/usr/lib

Right after that:

if (!QFileInfo::exists(path)) {
    if (toPatch.startsWith(QChar('/'))) {
        path = toPatch;
    } else {
        path = toPatch.mid(toPatch.indexOf('/', 1));
   }
}

So if the loop finished, but path does still not point to an existing file, the patch line must mean it's a new file to be created. In this case, we want to use the original path from the patch file (but chopping off one segment to the left if there is one).

The bug is in the fact that here, toPatch is the unmangled path still.

Therefore the immediate fix is to do something like path = mangle(toPatch) in these places.