feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Plugin manager: Robustify writing/reading of lock-file

Browse Source 
On some platforms the settings path might not exist at the time that we
want to write the lock file, so make sure the directory is created.

Amends 392b063fe8

Change-Id: Ic72ee59120cd1bb9ec3175d5032c94a936530300
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Eike Ziller
2020-01-21 11:16:38 +01:00
parent 44f1db19f4
commit c9a4176b2f
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libs/extensionsystem/pluginmanager.cpp
View File

@@ -1376,10 +1376,13 @@ public:
const QString lockFilePath = LockFile::filePath(pm);
if (QFile::exists(lockFilePath)) {
QFile f(lockFilePath);
f.open(QIODevice::ReadOnly);
const auto pluginName = QString::fromUtf8(f.readLine()).trimmed();
f.close();
return pluginName;
if (f.open(QIODevice::ReadOnly)) {
const auto pluginName = QString::fromUtf8(f.readLine()).trimmed();
f.close();
return pluginName;
} else {
qCDebug(pluginLog) << "Lock file" << lockFilePath << "exists but is not readable";
}
}
return {};
}
@@ -1387,11 +1390,15 @@ public:
LockFile(PluginManagerPrivate *pm, PluginSpec *spec)
: m_filePath(filePath(pm))
{
QDir().mkpath(QFileInfo(m_filePath).absolutePath());
QFile f(m_filePath);
f.open(QIODevice::WriteOnly);
f.write(spec->name().toUtf8());
f.write("\n");
f.close();
if (f.open(QIODevice::WriteOnly)) {
f.write(spec->name().toUtf8());
f.write("\n");
f.close();
} else {
qCDebug(pluginLog) << "Cannot write lock file" << m_filePath;
}
}
~LockFile() { QFile::remove(m_filePath); }