From 73b8ecd622008bf0b2b36b50da82b60b39b91171 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 12 Aug 2020 16:03:25 +0200
Subject: [PATCH] [unpackfs] Drop special-case for unpackfs

- make the module weight 12, rather than special-casing internals
---
 src/libcalamares/PythonJob.cpp   | 5 ++---
 src/libcalamares/PythonJob.h     | 3 +--
 src/modules/unpackfs/module.desc | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/libcalamares/PythonJob.cpp b/src/libcalamares/PythonJob.cpp
index 50828e896..87091101e 100644
--- a/src/libcalamares/PythonJob.cpp
+++ b/src/libcalamares/PythonJob.cpp
@@ -1,5 +1,5 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
- * 
+ *
  *   SPDX-FileCopyrightText: 2014-2016 Teo Mrnjavac <teo@kde.org>
  *   SPDX-FileCopyrightText: 2018-2020 Adriaan de Groot <groot@kde.org>
  *
@@ -184,7 +184,6 @@ PythonJob::PythonJob( const ModuleSystem::InstanceKey& instance,
     , m_workingPath( workingPath )
     , m_description()
     , m_configurationMap( moduleConfiguration )
-    , m_weight( ( instance.module() == QStringLiteral( "unpackfs" ) ) ? 12.0 : 1.0 )
 {
 }
 
@@ -194,7 +193,7 @@ PythonJob::~PythonJob() {}
 qreal
 PythonJob::getJobWeight() const
 {
-    return m_weight;
+    return 1.0;
 }
 
 QString
diff --git a/src/libcalamares/PythonJob.h b/src/libcalamares/PythonJob.h
index 498eac44f..6efc45e7f 100644
--- a/src/libcalamares/PythonJob.h
+++ b/src/libcalamares/PythonJob.h
@@ -1,5 +1,5 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
- * 
+ *
  *   SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
  *   SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
  *
@@ -68,7 +68,6 @@ private:
     QString m_workingPath;
     QString m_description;
     QVariantMap m_configurationMap;
-    qreal m_weight;
 };
 
 }  // namespace Calamares
diff --git a/src/modules/unpackfs/module.desc b/src/modules/unpackfs/module.desc
index 54d95df1d..c87613d74 100644
--- a/src/modules/unpackfs/module.desc
+++ b/src/modules/unpackfs/module.desc
@@ -5,3 +5,4 @@ name:       "unpackfs"
 interface:  "python"
 script:     "main.py"
 requiredModules: [ mount ]
+weight:     12