applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-29 02:15:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consistency: calamares_main ==> run; global_storage => globalStorage

Browse source
This commit is contained in:
Teo Mrnjavac 2014-07-25 16:41:21 +02:00
parent fb6d80ccb6
commit beafcd9cc4
7 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/testmodule.py
View file

@ -30,6 +30,7 @@ except ImportError:
raise
class Job:
def __init__( self, workingPath, doc ):
self.prettyName = "Testing job " + doc[ "name" ]
@ -37,7 +38,8 @@ class Job:
self.configuration = doc[ "configuration" ]
def setprogress( self, progress ):
print ( "Job set progress to {}%.".format( progress * 100 ) )
print( "Job set progress to {}%.".format( progress * 100 ) )
def main():
@ -59,21 +61,21 @@ def main():
return 1
libcalamares.job = Job( args.moduledir, doc )
libcalamares.global_storage = libcalamares.GlobalStorage()
libcalamares.globalStorage = libcalamares.GlobalStorage()
# if a file for simulating global_storage contents is provided, load it
# if a file for simulating globalStorage contents is provided, load it
if args.globalstorage_yaml:
with open( args.globalstorage_yaml ) as f:
doc = yaml.load( f )
for key, value in doc.items():
libcalamares.global_storage.insert( key, value )
libcalamares.globalStorage.insert( key, value )
scriptpath = os.path.abspath( args.moduledir )
sys.path.append( scriptpath )
import main
print( "Output from module:" )
print( main.calamares_main() )
print( main.run() )
return 0