From 1eff2606374b6aea996fb3fb918a179967f394c5 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Fri, 13 Feb 2015 11:56:10 +0100
Subject: [PATCH] Add debug output to the ClearMountsJob code path.

---
 src/modules/partition/core/PartitionCoreModule.cpp | 10 ++++++++++
 src/modules/partition/jobs/ClearMountsJob.cpp      | 11 +++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index 611b2c1f9..ec999c950 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -293,6 +293,16 @@ PartitionCoreModule::jobs() const
     }
     lst << Calamares::job_ptr( new FillGlobalStorageJob( devices, m_bootLoaderInstallPath ) );
 
+
+    QStringList jobsDebug;
+    foreach ( auto job, lst )
+    {
+        jobsDebug.append( job->prettyName() );
+    }
+
+    cDebug() << "PartitionCodeModule has been asked for jobs. About to return:"
+             << jobsDebug.join( "\n" );
+
     return lst;
 }
 
diff --git a/src/modules/partition/jobs/ClearMountsJob.cpp b/src/modules/partition/jobs/ClearMountsJob.cpp
index 88083037b..72b8e5e43 100644
--- a/src/modules/partition/jobs/ClearMountsJob.cpp
+++ b/src/modules/partition/jobs/ClearMountsJob.cpp
@@ -23,6 +23,7 @@
 #include <core/PartitionInfo.h>
 #include <core/PartitionIterator.h>
 #include <util/report.h>
+#include <utils/Logger.h>
 
 #include <QStringList>
 
@@ -45,30 +46,40 @@ ClearMountsJob::prettyName() const
 Calamares::JobResult
 ClearMountsJob::exec()
 {
+    cDebug() << "Executing ClearMounts job for device" << m_device->deviceNode();
     QStringList goodNews;
     for ( auto it = PartitionIterator::begin( m_device );
           it != PartitionIterator::end( m_device ); ++it )
     {
+        cDebug() << "Now examining device" << (*it)->partitionPath();
         if ( (*it)->isMounted() )
         {
+            cDebug() << "\tIt's mounted!";
             if ( (*it)->canUnmount() )
             {
+                cDebug() << "\tTrying to umount...";
                 Report report( 0, QString() );
                 (*it)->unmount( report );
                 goodNews.append( report.toText() );
+                cDebug() << "\tUmounted" << (*it)->partitionPath();
             }
             else
             {
+                cDebug() << "\tCannot umount. This is very bad.";
                 return Calamares::JobResult::error( tr( "Cannot umount partition %1" )
                                                         .arg( (*it)->deviceNode() ),
                                                     tr( "Cannot proceed with partitioning operations "
                                                         "because some partitions are still mounted." ) );
             }
         }
+        else
+            cDebug() << "\tIt's not mounted.";
     }
     Calamares::JobResult ok = Calamares::JobResult::ok();
     ok.setMessage( tr( "Cleared all mounts for %1" )
                         .arg( m_device->deviceNode() ) );
     ok.setDetails( goodNews.join( "\n" ) );
+
+    cDebug() << "Finished ClearMounts job.";
     return ok;
 }