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

[libcalamares] PythonJob created with InstanceKey

Browse Source
This commit is contained in:
Adriaan de Groot 2020-01-25 15:15:32 +01:00
parent d86b6bddeb
commit 71a73ee1a1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcalamares/PythonJob.cpp
View File

@ -170,7 +170,7 @@ namespace Calamares
{
PythonJob::PythonJob( const QString& instance,
PythonJob::PythonJob( const ModuleSystem::InstanceKey& instance,
const QString& scriptFile,
const QString& workingPath,
const QVariantMap& moduleConfiguration,
@ -180,7 +180,7 @@ PythonJob::PythonJob( const QString& instance,
, m_workingPath( workingPath )
, m_description()
, m_configurationMap( moduleConfiguration )
, m_weight( (instance == QStringLiteral( "unpackfs" )) ? 12.0 : 1.0 )
, m_weight( (instance.module() == QStringLiteral( "unpackfs" )) ? 12.0 : 1.0 )
{
}

2
src/libcalamares/PythonJob.h
View File

@ -38,7 +38,7 @@ class PythonJob : public Job
{
Q_OBJECT
public:
explicit PythonJob( const QString& instance, // TODO: InstanceKey
explicit PythonJob( const ModuleSystem::InstanceKey& instance,
const QString& scriptFile,
const QString& workingPath,
const QVariantMap& moduleConfiguration = QVariantMap(),

2
src/libcalamaresui/modulesystem/PythonJobModule.cpp
View File

@ -49,7 +49,7 @@ PythonJobModule::loadSelf()
return;
}
m_job = Calamares::job_ptr( new PythonJob( name(), m_scriptFileName, m_workingPath, m_configurationMap ) );
m_job = Calamares::job_ptr( new PythonJob( instanceKey(), m_scriptFileName, m_workingPath, m_configurationMap ) );
m_loaded = true;
}