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

rename jsonCommand variable to sfdiskJsonCommand.

This commit is contained in:
Andrius Štikonas 2020-10-02 17:35:23 +01:00
parent 5cfa8343fe
commit b97fd0eeaa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,11 +187,11 @@ Device* SfdiskBackend::scanDevice(const QString& deviceNode)
deviceNode });
ExternalCommand sizeCommand(QStringLiteral("blockdev"), { QStringLiteral("--getsize64"), deviceNode });
ExternalCommand sizeCommand2(QStringLiteral("blockdev"), { QStringLiteral("--getss"), deviceNode });
ExternalCommand jsonCommand(QStringLiteral("sfdisk"), { QStringLiteral("--json"), deviceNode }, QProcess::ProcessChannelMode::SeparateChannels );
ExternalCommand sfdiskJsonCommand(QStringLiteral("sfdisk"), { QStringLiteral("--json"), deviceNode }, QProcess::ProcessChannelMode::SeparateChannels );
if ( sizeCommand.run(-1) && sizeCommand.exitCode() == 0
&& sizeCommand2.run(-1) && sizeCommand2.exitCode() == 0
&& jsonCommand.run(-1) )
&& sfdiskJsonCommand.run(-1) )
{
Device* d = nullptr;
qint64 deviceSize = sizeCommand.output().trimmed().toLongLong();
@ -251,10 +251,10 @@ Device* SfdiskBackend::scanDevice(const QString& deviceNode)
if ( d )
{
if (jsonCommand.exitCode() != 0)
if (sfdiskJsonCommand.exitCode() != 0)
return d;
auto s = jsonCommand.rawOutput();
auto s = sfdiskJsonCommand.rawOutput();
fixInvalidJsonFromSFDisk(s);
const QJsonObject jsonObject = QJsonDocument::fromJson(s).object();