From 8387d5d81f38e046bb58a79fadaa138854af3d20 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 15 Jun 2018 10:20:07 -0400
Subject: [PATCH] [libcalamares] Allow emergency jobs

Any job can be an emergency job; emergency modules spawn
emergency jobs (but conversely, a non-emergency module
can spawn an emergency job explicitly).
---
 src/libcalamares/Job.h                   |  7 +++++++
 src/libcalamaresui/ExecutionViewStep.cpp | 11 ++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/libcalamares/Job.h b/src/libcalamares/Job.h
index 6063633b8..040ead6ad 100644
--- a/src/libcalamares/Job.h
+++ b/src/libcalamares/Job.h
@@ -66,8 +66,15 @@ public:
     virtual QString prettyDescription() const;
     virtual QString prettyStatusMessage() const;
     virtual JobResult exec() = 0;
+
+    bool isEmergency() const { return m_emergency; }
+    void setEmergency( bool e ) { m_emergency = e; }
+
 signals:
     void progress( qreal percent );
+
+private:
+    bool m_emergency = false;
 };
 
 } // namespace Calamares
diff --git a/src/libcalamaresui/ExecutionViewStep.cpp b/src/libcalamaresui/ExecutionViewStep.cpp
index 109bd1384..b505102a4 100644
--- a/src/libcalamaresui/ExecutionViewStep.cpp
+++ b/src/libcalamaresui/ExecutionViewStep.cpp
@@ -21,6 +21,7 @@
 #include <ExecutionViewStep.h>
 
 #include "Branding.h"
+#include "Job.h"
 #include "JobQueue.h"
 #include "modulesystem/Module.h"
 #include "modulesystem/ModuleManager.h"
@@ -142,7 +143,15 @@ ExecutionViewStep::onActivate()
         Calamares::Module* module = Calamares::ModuleManager::instance()
                                     ->moduleInstance( instanceKey );
         if ( module )
-            queue->enqueue( module->jobs() );
+        {
+            auto jl = module->jobs();
+            if ( module->isEmergency() )
+            {
+                for( auto& j : jl )
+                    j->setEmergency( true );
+            }
+            queue->enqueue( jl );
+        }
     }
 
     queue->start();