Do not bundle dependencies of platformthemes, should fix #236; previous commit led to segfault
This commit is contained in:
@@ -351,17 +351,17 @@ LddInfo findDependencyInfo(const QString &binaryPath)
|
||||
LddInfo info;
|
||||
info.binaryPath = binaryPath;
|
||||
|
||||
if (binaryPath.contains("platformthemes")) {
|
||||
LogDebug() << "Not running ldd on" << binaryPath << "because we do not bundle dependencies of platformthemes";
|
||||
return info;
|
||||
}
|
||||
|
||||
LogDebug() << "Using ldd:";
|
||||
LogDebug() << " inspecting" << binaryPath;
|
||||
QProcess ldd;
|
||||
ldd.start("ldd", QStringList() << binaryPath);
|
||||
ldd.waitForFinished();
|
||||
|
||||
if (binaryPath.contains("platformthemes")) {
|
||||
LogDebug() << "Skipping" << binaryPath << "because we do not bundle dependencies of platformthemes";
|
||||
return info;
|
||||
}
|
||||
|
||||
if (ldd.exitStatus() != QProcess::NormalExit || ldd.exitCode() != 0) {
|
||||
LogError() << "findDependencyInfo:" << ldd.readAllStandardError();
|
||||
return info;
|
||||
|
||||
Reference in New Issue
Block a user