kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-19 21:30:10 +01:00
Code Activity

Merge branch 'fix_vagrantfile' into 'master'

Browse Source 
Set vm_provider in example Vagrantfile.yaml

See merge request fdroid/fdroidserver!1277
This commit is contained in:
Hans-Christoph Steiner 2023-02-08 21:17:23 +00:00
commit c5ba4bc848
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makebuildserver
View File

@ -84,6 +84,9 @@ if not os.path.exists(configfile):
shutil.copy('examples/Vagrantfile.yaml', configfile) shutil.copy('examples/Vagrantfile.yaml', configfile)
with open(configfile) as fp: with open(configfile) as fp:
config = yaml.safe_load(fp) config = yaml.safe_load(fp)
if not isinstance(config, dict):
logging.info("config is empty or not a dict, using default.")
config = {}
with open('buildserver/Vagrantfile') as fp: with open('buildserver/Vagrantfile') as fp:
m = re.search(r"""\.vm\.box\s*=\s*["'](.*)["']""", fp.read()) m = re.search(r"""\.vm\.box\s*=\s*["'](.*)["']""", fp.read())
if not m: if not m: