[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kpmcore] src/fs: Handle cryptsetup luksUUID failure.
From:       Teo Mrnjavac <teo () kde ! org>
Date:       2016-11-16 14:20:58
Message-ID: E1c7158-0002BY-Q7 () code ! kde ! org
[Download RAW message or body]

Git commit eb3b90ec9e2785f9b73a47f0256a750a054084e0 by Teo Mrnjavac.
Committed on 16/11/2016 at 14:20.
Pushed by mrnjavac into branch 'master'.

Handle cryptsetup luksUUID failure.

M  +10   -0    src/fs/luks.cpp

http://commits.kde.org/kpmcore/eb3b90ec9e2785f9b73a47f0256a750a054084e0

diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp
index fe74af9..ab15f1a 100644
--- a/src/fs/luks.cpp
+++ b/src/fs/luks.cpp
@@ -512,9 +512,19 @@ QString luks::readUUID(const QString& deviceNode) const
 =

 QString luks::readOuterUUID(const QString &deviceNode) const
 {
+    if ( deviceNode.isEmpty() )
+        return QString();
+
     ExternalCommand cmd(QStringLiteral("cryptsetup"),
                         { QStringLiteral("luksUUID"), deviceNode });
     if (cmd.run()) {
+        if ( cmd.exitCode() )
+        {
+            qWarning() << "Cannot get luksUUID for device" << deviceNode
+                       << "\tcryptsetup exit code" << cmd.exitCode()
+                       << "\toutput:" << cmd.output().trimmed();
+            return QString();
+        }
         return cmd.output().trimmed();
     }
     return QStringLiteral("---");
[prev in list] [next in list] [prev in thread] [next in thread]