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

libcalamares.job is of type libcalamares.Job

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-07-23 13:02:42 +02:00
parent ef28b7f2c1
commit da83ecfb13
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
settings.conf
View File

@ -18,7 +18,7 @@ prepare:
- greeting - greeting
- locale - locale
- keyboard - keyboard
- partition #- partition
- summary - summary
# Phase 2 - install. # Phase 2 - install.
@ -28,8 +28,8 @@ prepare:
install: install:
- dummyprocess - dummyprocess
- dummypython - dummypython
- partition #- partition
- mount #- mount
#- unsquashfs #- unsquashfs
- locale - locale
- keyboard - keyboard

2
src/libcalamares/PythonJob.cpp
View File

@ -42,7 +42,7 @@ BOOST_PYTHON_MODULE( libcalamares )
bp::scope().attr( "version" ) = CALAMARES_VERSION; bp::scope().attr( "version" ) = CALAMARES_VERSION;
bp::scope().attr( "shortVersion" ) = CALAMARES_VERSION_SHORT; 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( "prettyName", &CalamaresPython::PythonJobInterface::prettyName )
.def_readonly( "workingPath", &CalamaresPython::PythonJobInterface::workingPath ) .def_readonly( "workingPath", &CalamaresPython::PythonJobInterface::workingPath )
.def_readonly( "configuration", &CalamaresPython::PythonJobInterface::configuration ) .def_readonly( "configuration", &CalamaresPython::PythonJobInterface::configuration )

13
src/modules/dummypython/main.py
View File

@ -28,5 +28,18 @@ def calamares_main():
accumulator += "This job's name: " + libcalamares.job.prettyName + "\n" accumulator += "This job's name: " + libcalamares.job.prettyName + "\n"
accumulator += "This job's path: " + libcalamares.job.workingPath + "\n" accumulator += "This job's path: " + libcalamares.job.workingPath + "\n"
accumulator += str( libcalamares.job.configuration ) 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 return accumulator