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

List:       kde-commits
Subject:    [kpmcore] src/fs: Make sure to always also read outerUuid.
From:       Teo Mrnjavac <teo () kde ! org>
Date:       2016-11-30 16:45:06
Message-ID: E1cC80I-0001eK-Ss () code ! kde ! org
[Download RAW message or body]

Git commit 52b356e45f72e6ec9fcd9a6595c65ee13c7bbb94 by Teo Mrnjavac.
Committed on 30/11/2016 at 16:44.
Pushed by mrnjavac into branch 'master'.

Make sure to always also read outerUuid.

M  +2    -1    src/fs/luks.cpp

https://commits.kde.org/kpmcore/52b356e45f72e6ec9fcd9a6595c65ee13c7bbb94

diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp
index 7b77dcf..a11d75d 100644
--- a/src/fs/luks.cpp
+++ b/src/fs/luks.cpp
@@ -505,9 +505,10 @@ bool luks::resize(Report& report, const QString& deviceNode, qint64 newLength) c
 
 QString luks::readUUID(const QString& deviceNode) const
 {
+    QString outerUuid = readOuterUUID(deviceNode);
     if (m_isCryptOpen && m_innerFs)
         return m_innerFs->readUUID(mapperName());
-    return readOuterUUID(deviceNode);
+    return outerUuid;
 }
 
 QString luks::readOuterUUID(const QString &deviceNode) const
[prev in list] [next in list] [prev in thread] [next in thread]