andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' into kauth

This commit is contained in:
Andrius Štikonas 2018-02-04 13:41:14 +00:00
parent f426f59799 8aac14ceca
commit 4cae6f0632
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/sfdisk/sfdiskbackend.cpp
View File

@ -364,7 +364,7 @@ QString SfdiskBackend::readLabel(const QString& deviceNode) const
QStringLiteral("info"),
QStringLiteral("--query=property"),
deviceNode });
udevCommand.run();
QRegularExpression re(QStringLiteral("ID_FS_LABEL=(\\w+)"));
QRegularExpressionMatch reFileSystemLabel = re.match(udevCommand.output());
if (reFileSystemLabel.hasMatch())
@ -379,6 +379,7 @@ QString SfdiskBackend::readUUID(const QString& deviceNode) const
QStringLiteral("info"),
QStringLiteral("--query=property"),
deviceNode });
udevCommand.run();
QRegularExpression re(QStringLiteral("ID_FS_UUID=(\\w+)"));
QRegularExpressionMatch reFileSystemUUID = re.match(udevCommand.output());
if (reFileSystemUUID.hasMatch())