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

Merge pull request #107 from plfiorini/testmodule

Browse Source 
Initialize globalstorage before loading custom configuration
This commit is contained in:
Teo Mrnjavac 2014-08-21 10:05:56 +02:00
commit b54f91c1f8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/testmodule.py
View File

@ -64,6 +64,8 @@ def main():
print("Only Python jobs can be tested.") print("Only Python jobs can be tested.")
return 1 return 1
libcalamares.globalstorage = libcalamares.GlobalStorage()
# if a file for simulating globalStorage contents is provided, load it # if a file for simulating globalStorage contents is provided, load it
if args.globalstorage_yaml: if args.globalstorage_yaml:
with open(args.globalstorage_yaml) as f: with open(args.globalstorage_yaml) as f:
@ -77,7 +79,6 @@ def main():
cfg_doc = yaml.load(f) cfg_doc = yaml.load(f)
libcalamares.job = Job(args.moduledir, doc, cfg_doc) libcalamares.job = Job(args.moduledir, doc, cfg_doc)
libcalamares.globalstorage = libcalamares.GlobalStorage()
scriptpath = os.path.abspath(args.moduledir) scriptpath = os.path.abspath(args.moduledir)
sys.path.append(scriptpath) sys.path.append(scriptpath)