From 138fd82a8cc00f97649a64f810a737bdb863ce48 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Wed, 27 Dec 2017 10:13:05 -0500
Subject: [PATCH] [partition]: fix cDebug() format

---
 .../partition/core/PartitionCoreModule.cpp     |  9 +++++----
 .../partition/jobs/CreatePartitionTableJob.cpp | 18 +++++++++++++++---
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index e8cdc64b8..ee1b0f7c0 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -403,8 +403,9 @@ PartitionCoreModule::jobs() const
     foreach ( auto job, lst )
         jobsDebug.append( job->prettyName() );
 
-    cDebug() << "PartitionCodeModule has been asked for jobs. About to return:"
-             << jobsDebug.join( "\n" );
+    cDebug() << "PartitionCodeModule has been asked for jobs. About to return:";
+    for ( const auto item: jobsDebug )
+        cDebug() << "  .." << item;
 
     return lst;
 }
@@ -427,9 +428,9 @@ PartitionCoreModule::dumpQueue() const
     cDebug() << "# Queue:";
     for ( auto info : m_deviceInfos )
     {
-        cDebug() << "## Device:" << info->device->name();
+        cDebug() << "  .. Device:" << info->device->name();
         for ( auto job : info->jobs )
-            cDebug() << "-" << job->prettyName();
+            cDebug() << "  .." << job->prettyName();
     }
 }
 
diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp
index 2aec4a5fc..3ae201d62 100644
--- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp
@@ -73,21 +73,33 @@ CreatePartitionTableJob::exec()
 
     PartitionTable* table = m_device->partitionTable();
     cDebug() << "Creating new partition table of type" << table->typeName()
-             << ", uncommitted yet:\n" << table;
+             << " - Uncommitted yet: " << table;
 
     QProcess lsblk;
     lsblk.setProgram( "lsblk" );
     lsblk.setProcessChannelMode( QProcess::MergedChannels );
     lsblk.start();
     lsblk.waitForFinished();
-    cDebug() << "lsblk:\n" << lsblk.readAllStandardOutput();
+
+    QByteArray byte = lsblk.readAllStandardOutput();
+    QStringList lines = QString(byte).split(("\n"),QString::SkipEmptyParts);
+    cDebug() << "CreatePartitionTableJob asked for lsblk output:";
+
+    for (const auto line: lines)
+        cDebug() << "  .." << line;
 
     QProcess mount;
     mount.setProgram( "mount" );
     mount.setProcessChannelMode( QProcess::MergedChannels );
     mount.start();
     mount.waitForFinished();
-    cDebug() << "mount:\n" << mount.readAllStandardOutput();
+
+    QByteArray mbyte = mount.readAllStandardOutput();
+    QStringList mlines = QString(mbyte).split(("\n"),QString::SkipEmptyParts);
+    cDebug() << "CreatePartitionTableJob asked for mount output:";
+
+    for (const auto mline: mlines)
+        cDebug() << "  .." << mline;
 
     CreatePartitionTableOperation op(*m_device, table);
     op.setStatus(Operation::StatusRunning);