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

[unpackfs] Drop special-case for unpackfs

Browse Source 
- make the module weight 12, rather than special-casing internals
This commit is contained in:
Adriaan de Groot 2020-08-12 16:03:25 +02:00
parent c19866f887
commit 73b8ecd622
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libcalamares/PythonJob.cpp
View File

@ -1,5 +1,5 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* SPDX-FileCopyrightText: 2014-2016 Teo Mrnjavac <teo@kde.org> * SPDX-FileCopyrightText: 2014-2016 Teo Mrnjavac <teo@kde.org>
* SPDX-FileCopyrightText: 2018-2020 Adriaan de Groot <groot@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_workingPath( workingPath )
, m_description() , m_description()
, m_configurationMap( moduleConfiguration ) , m_configurationMap( moduleConfiguration )
, m_weight( ( instance.module() == QStringLiteral( "unpackfs" ) ) ? 12.0 : 1.0 )
{ {
} }
@ -194,7 +193,7 @@ PythonJob::~PythonJob() {}
qreal qreal
PythonJob::getJobWeight() const PythonJob::getJobWeight() const
{ {
return m_weight; return 1.0;
} }
QString QString

3
src/libcalamares/PythonJob.h
View File

@ -1,5 +1,5 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org> * SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
* SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org> * SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
* *
@ -68,7 +68,6 @@ private:
QString m_workingPath; QString m_workingPath;
QString m_description; QString m_description;
QVariantMap m_configurationMap; QVariantMap m_configurationMap;
qreal m_weight;
}; };
} // namespace Calamares } // namespace Calamares

1
src/modules/unpackfs/module.desc
View File

@ -5,3 +5,4 @@ name: "unpackfs"
interface: "python" interface: "python"
script: "main.py" script: "main.py"
requiredModules: [ mount ] requiredModules: [ mount ]
weight: 12