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 15:56:38 +00:00
parent b35c21ed71 dcc9875923
commit 2641730c0c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/partition.cpp
View File

@ -99,6 +99,8 @@ Partition::Partition(const Partition& other, PartitionNode* parent) :
m_FirstSector(other.m_FirstSector), m_FirstSector(other.m_FirstSector),
m_LastSector(other.m_LastSector), m_LastSector(other.m_LastSector),
m_DevicePath(other.m_DevicePath), m_DevicePath(other.m_DevicePath),
m_Label(other.m_Label),
m_UUID(other.m_UUID),
m_MountPoint(other.m_MountPoint), m_MountPoint(other.m_MountPoint),
m_AvailableFlags(other.m_AvailableFlags), m_AvailableFlags(other.m_AvailableFlags),
m_ActiveFlags(other.m_ActiveFlags), m_ActiveFlags(other.m_ActiveFlags),
@ -136,6 +138,8 @@ Partition& Partition::operator=(const Partition& other)
m_FirstSector = other.m_FirstSector; m_FirstSector = other.m_FirstSector;
m_LastSector = other.m_LastSector; m_LastSector = other.m_LastSector;
m_DevicePath = other.m_DevicePath; m_DevicePath = other.m_DevicePath;
m_Label = other.m_Label;
m_UUID = other.m_UUID;
m_PartitionPath = other.m_PartitionPath; m_PartitionPath = other.m_PartitionPath;
m_MountPoint = other.m_MountPoint; m_MountPoint = other.m_MountPoint;
m_AvailableFlags = other.m_AvailableFlags; m_AvailableFlags = other.m_AvailableFlags;

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);