mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-15 07:22:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'newcomers' into 'master'

Browse source 
allow starting without config.py

See merge request fdroid/fdroidserver!335
This commit is contained in:
Hans-Christoph Steiner 2017-09-16 08:07:56 +00:00
commit acac15f74d
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
fdroidserver/common.py
View file

@ -239,8 +239,8 @@ def read_config(opts, config_file='config.py'):
with io.open(config_file, "rb") as f:
code = compile(f.read(), config_file, 'exec')
exec(code, None, config)
elif len(get_local_metadata_files()) == 0:
raise FDroidException("Missing config file - is this a repo directory?")
else:
logging.debug("No config.py found - using defaults.")
for k in ('mirrors', 'install_list', 'uninstall_list', 'serverwebroot', 'servergitroot'):
if k in config:
@ -2315,7 +2315,10 @@ def write_to_config(thisconfig, key, value=None, config_file=None):
value = thisconfig[origkey] if origkey in thisconfig else thisconfig[key]
cfg = config_file if config_file else 'config.py'
# load config file
# load config file, create one if it doesn't exist
if not os.path.exists(cfg):
os.mknod(cfg)
logging.info("Creating empty " + cfg)
with open(cfg, 'r', encoding="utf-8") as f:
lines = f.readlines()