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

sfdisk: fix returned partition name 

This makes it work with partitions such as /dev/mmcblk1p2
This commit is contained in:
Andrius Štikonas 2018-07-11 23:36:20 +01:00
parent e2f88dbbf9
commit d51404c7f1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/sfdisk/sfdiskpartitiontable.cpp
View File

@ -76,12 +76,16 @@ QString SfdiskPartitionTable::createPartition(Report& report, const Partition& p
if ( createCommand.write(QByteArrayLiteral("start=") + QByteArray::number(partition.firstSector()) +
type +
QByteArrayLiteral(" size=") + QByteArray::number(partition.length()) + QByteArrayLiteral("\nwrite\n")) && createCommand.start(-1) && createCommand.waitFor() ) {
QRegularExpression re(QStringLiteral("Created a new partition (\\d)"));
QRegularExpression re(QStringLiteral("Created a new partition (\\d+)"));
QRegularExpressionMatch rem = re.match(createCommand.output());
// TODO: Needs refactoring. Workaround to check if device path is RAID and include 'p' character before partition number.
if (rem.hasMatch())
return partition.devicePath() + (SoftwareRAID::isRaidPath(partition.devicePath()) ? QStringLiteral("p") : QStringLiteral("")) + rem.captured(1);
if (rem.hasMatch()) {
// TODO: Use back() with Qt 5.10
if ( partition.devicePath()[partition.devicePath().size() - 1].isDigit() )
return partition.devicePath() + QLatin1Char('p') + rem.captured(1);
else
return partition.devicePath() + rem.captured(1);
}
}
report.line() << xi18nc("@info:progress", "Failed to add partition <filename>%1</filename> to device <filename>%2</filename>.", partition.deviceNode(), m_device->deviceNode());