Merge branch '3.2'
This commit is contained in:
commit
87e210432d
|
@ -24,6 +24,9 @@
|
||||||
|
|
||||||
#include "util/report.h"
|
#include "util/report.h"
|
||||||
|
|
||||||
|
#include <QDebug>
|
||||||
|
#include <QThread>
|
||||||
|
|
||||||
#include <KLocalizedString>
|
#include <KLocalizedString>
|
||||||
|
|
||||||
/** Creates a new CheckFileSystemJob
|
/** Creates a new CheckFileSystemJob
|
||||||
|
@ -45,6 +48,15 @@ bool CheckFileSystemJob::run(Report& parent)
|
||||||
if (partition().fileSystem().supportCheck() == FileSystem::cmdSupportFileSystem)
|
if (partition().fileSystem().supportCheck() == FileSystem::cmdSupportFileSystem)
|
||||||
rval = partition().fileSystem().check(*report, partition().deviceNode());
|
rval = partition().fileSystem().check(*report, partition().deviceNode());
|
||||||
|
|
||||||
|
// HACK
|
||||||
|
// In rare cases after moving file system to a new location file system check
|
||||||
|
// fails on the first try. As a temporary workaround, wait a bit and try again.
|
||||||
|
if (!rval) {
|
||||||
|
QThread::sleep(2);
|
||||||
|
qDebug() << "Partition might not be ready yet. Retrying...";
|
||||||
|
rval = partition().fileSystem().check(*report, partition().deviceNode());
|
||||||
|
}
|
||||||
|
|
||||||
jobFinished(*report, rval);
|
jobFinished(*report, rval);
|
||||||
|
|
||||||
return rval;
|
return rval;
|
||||||
|
|
Loading…
Reference in New Issue