napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[partition] Tidy debug output when creating table

Browse Source
This commit is contained in:
Adriaan de Groot 2021-06-18 15:50:13 +02:00
parent b29f3e919b
commit bf7eed9342
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/modules/partition/jobs/CreatePartitionTableJob.cpp
View File

@ -75,13 +75,13 @@ CreatePartitionTableJob::exec()
QString message = tr( "The installer failed to create a partition table on %1." ).arg( m_device->name() ); QString message = tr( "The installer failed to create a partition table on %1." ).arg( m_device->name() );
PartitionTable* table = m_device->partitionTable(); PartitionTable* table = m_device->partitionTable();
cDebug() << "Creating new partition table of type" << table->typeName() << ", uncommitted yet:";
if ( Logger::logLevelEnabled( Logger::LOGDEBUG ) ) if ( Logger::logLevelEnabled( Logger::LOGDEBUG ) )
{ {
cDebug() << "Creating new partition table of type" << table->typeName() << ", uncommitted partitions:";
for ( auto it = PartitionIterator::begin( table ); it != PartitionIterator::end( table ); ++it ) for ( auto it = PartitionIterator::begin( table ); it != PartitionIterator::end( table ); ++it )
{ {
cDebug() << it; cDebug() << Logger::SubEntry << it;
} }
QProcess lsblk; QProcess lsblk;
@ -89,14 +89,14 @@ CreatePartitionTableJob::exec()
lsblk.setProcessChannelMode( QProcess::MergedChannels ); lsblk.setProcessChannelMode( QProcess::MergedChannels );
lsblk.start(); lsblk.start();
lsblk.waitForFinished(); lsblk.waitForFinished();
cDebug() << "lsblk:\n" << lsblk.readAllStandardOutput(); cDebug() << Logger::SubEntry << "lsblk output:\n" << Logger::NoQuote << lsblk.readAllStandardOutput();
QProcess mount; QProcess mount;
mount.setProgram( "mount" ); // Debug output only, not mounting something mount.setProgram( "mount" ); // Debug output only, not mounting something
mount.setProcessChannelMode( QProcess::MergedChannels ); mount.setProcessChannelMode( QProcess::MergedChannels );
mount.start(); mount.start();
mount.waitForFinished(); mount.waitForFinished();
cDebug() << "mount:\n" << mount.readAllStandardOutput(); cDebug() << Logger::SubEntry << "mount output:\n" << Logger::NoQuote << mount.readAllStandardOutput();
} }
CreatePartitionTableOperation op( *m_device, table ); CreatePartitionTableOperation op( *m_device, table );