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

Fix regular expression used in readLabel and readUUID.

This commit is contained in:
Andrius Štikonas 2018-02-04 15:56:30 +00:00
parent 469855f7f7
commit dcc9875923
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,7 +365,7 @@ QString SfdiskBackend::readLabel(const QString& deviceNode) const
QStringLiteral("--query=property"), QStringLiteral("--query=property"),
deviceNode }); deviceNode });
udevCommand.run(); udevCommand.run();
QRegularExpression re(QStringLiteral("ID_FS_LABEL=(\\w+)")); QRegularExpression re(QStringLiteral("ID_FS_LABEL=(.*)"));
QRegularExpressionMatch reFileSystemLabel = re.match(udevCommand.output()); QRegularExpressionMatch reFileSystemLabel = re.match(udevCommand.output());
if (reFileSystemLabel.hasMatch()) if (reFileSystemLabel.hasMatch())
return reFileSystemLabel.captured(1); return reFileSystemLabel.captured(1);
@ -380,7 +380,7 @@ QString SfdiskBackend::readUUID(const QString& deviceNode) const
QStringLiteral("--query=property"), QStringLiteral("--query=property"),
deviceNode }); deviceNode });
udevCommand.run(); udevCommand.run();
QRegularExpression re(QStringLiteral("ID_FS_UUID=(\\w+)")); QRegularExpression re(QStringLiteral("ID_FS_UUID=(.*)"));
QRegularExpressionMatch reFileSystemUUID = re.match(udevCommand.output()); QRegularExpressionMatch reFileSystemUUID = re.match(udevCommand.output());
if (reFileSystemUUID.hasMatch()) if (reFileSystemUUID.hasMatch())
return reFileSystemUUID.captured(1); return reFileSystemUUID.captured(1);