diff --git a/settings.conf b/settings.conf index c8d163974..130df143f 100644 --- a/settings.conf +++ b/settings.conf @@ -18,7 +18,7 @@ prepare: - greeting - locale - keyboard -- partition +#- partition - summary # Phase 2 - install. @@ -28,8 +28,8 @@ prepare: install: - dummyprocess - dummypython -- partition -- mount +#- partition +#- mount #- unsquashfs - locale - keyboard diff --git a/src/libcalamares/PythonJob.cpp b/src/libcalamares/PythonJob.cpp index 68233b492..459ed093b 100644 --- a/src/libcalamares/PythonJob.cpp +++ b/src/libcalamares/PythonJob.cpp @@ -42,7 +42,7 @@ BOOST_PYTHON_MODULE( libcalamares ) bp::scope().attr( "version" ) = CALAMARES_VERSION; bp::scope().attr( "shortVersion" ) = CALAMARES_VERSION_SHORT; - bp::class_< CalamaresPython::PythonJobInterface >( "job", bp::init< Calamares::PythonJob* >() ) + bp::class_< CalamaresPython::PythonJobInterface >( "Job", bp::init< Calamares::PythonJob* >() ) .def_readonly( "prettyName", &CalamaresPython::PythonJobInterface::prettyName ) .def_readonly( "workingPath", &CalamaresPython::PythonJobInterface::workingPath ) .def_readonly( "configuration", &CalamaresPython::PythonJobInterface::configuration ) diff --git a/src/modules/dummypython/main.py b/src/modules/dummypython/main.py index 73cedf95c..b9435f145 100644 --- a/src/modules/dummypython/main.py +++ b/src/modules/dummypython/main.py @@ -28,5 +28,18 @@ def calamares_main(): accumulator += "This job's name: " + libcalamares.job.prettyName + "\n" accumulator += "This job's path: " + libcalamares.job.workingPath + "\n" accumulator += str( libcalamares.job.configuration ) + accumulator += " *** GlobalStorage test ***\n" + accumulator += "lala: " + str( libcalamares.global_storage.contains( "lala" ) ) + "\n" + accumulator += "foo: " + str( libcalamares.global_storage.contains( "foo" ) ) + "\n" + accumulator += "count: " + str( libcalamares.global_storage.count() ) + "\n" + libcalamares.global_storage.insert( "item2", "value2" ) + libcalamares.global_storage.insert( "item3", 3 ) + accumulator += "keys: " + str( libcalamares.global_storage.keys() ) + "\n" + accumulator += "remove: " + str( libcalamares.global_storage.remove( "item2" ) ) + "\n" + accumulator += "values: " + str( libcalamares.global_storage.value( "foo" ) )+ " "\ + + str( libcalamares.global_storage.value( "item2" ) ) + " "\ + + str( libcalamares.global_storage.value( "item3" ) ) + "\n" + + libcalamares.job.setprogress( 0.1 ) return accumulator