Skip to content

Commit 5f9e2c9

Browse files
nephrosnephros
authored andcommitted
Resolve symlinks before adding to primed cache
1 parent 475ac37 commit 5f9e2c9

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/bin/patchmanager-daemon/patchmanagerobject.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3042,15 +3042,17 @@ PatchManagerFilter::PatchManagerFilter(QObject *parent, int maxCost )
30423042
}
30433043

30443044
/* initialize the "static members", i.e. a list of very frequesntly accessed files. */
3045-
/* only use relatively stable sonames here. No symlinks! */
3045+
/* only use relatively stable sonames here. */
30463046
const QStringList PatchManagerFilter::libList = QStringList({
3047-
"/usr/lib64/libtls-padding.so",
30483047
"/usr/lib64/libpreloadpatchmanager.so",
3048+
"/lib/ld-linux-aarch64.so.1",
3049+
"/lib/ld-linux-armhf.so.3",
30493050
"/lib64/libc.so.6",
30503051
"/lib64/libdl.so.2",
30513052
"/lib64/librt.so.1",
30523053
"/lib64/libpthread.so.0",
30533054
"/lib64/libgcc_s.so.1",
3055+
"/usr/lib64/libtls-padding.so",
30543056
"/usr/lib64/libsystemd.so.0",
30553057
"/usr/lib64/libcap.so.2",
30563058
"/usr/lib64/libmount.so.1",
@@ -3085,8 +3087,10 @@ void PatchManagerFilter::setup()
30853087
if (Q_PROCESSOR_WORDSIZE == 4) { // 32 bit
30863088
libentry.replace("lib64", "lib");
30873089
}
3090+
30883091
if (QFileInfo::exists(libentry)) {
3089-
insert(libentry, new QObject(), HOTCACHE_COST_WEAK);
3092+
QFileInfo fi(libentry);
3093+
insert(fi.canonicalFilePath(), new QObject(), HOTCACHE_COST_WEAK);
30903094
}
30913095
}
30923096
}

0 commit comments

Comments
 (0)