From 8909dd87d0dcfd7a92267bf2848308f9b4bd90b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Mon, 30 Oct 2017 15:44:31 +0000 Subject: [PATCH 1/2] Add a workaround for device not ready error. 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. --- src/jobs/checkfilesystemjob.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/jobs/checkfilesystemjob.cpp b/src/jobs/checkfilesystemjob.cpp index 9ac2a19..866de6a 100644 --- a/src/jobs/checkfilesystemjob.cpp +++ b/src/jobs/checkfilesystemjob.cpp @@ -24,6 +24,9 @@ #include "util/report.h" +#include +#include + #include /** Creates a new CheckFileSystemJob @@ -45,6 +48,15 @@ bool CheckFileSystemJob::run(Report& parent) if (partition().fileSystem().supportCheck() == FileSystem::cmdSupportFileSystem) 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); return rval; From 3cb1eeef80d0c77d44e7678786fa2bc1fdd7a6cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Mon, 30 Oct 2017 15:59:35 +0000 Subject: [PATCH 2/2] Bump version to 3.2.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9f70be..ec2de2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) set(QT_MIN_VERSION "5.7.0") set(VERSION_MAJOR "3") set(VERSION_MINOR "2") -set(VERSION_RELEASE "0") +set(VERSION_RELEASE "1") set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}) set(SOVERSION "6") add_definitions(-D'VERSION="${VERSION}"') #"