[libcalamares] PythonJob created with InstanceKey

src/libcalamares/PythonJob.cpp

@@ -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 )
 {
 }
 

src/libcalamares/PythonJob.h

@@ -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(),

src/libcalamaresui/modulesystem/PythonJobModule.cpp

@@ -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;
 }