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

Fixes to makebuildserver and verify

Browse source
This commit is contained in:
Daniel Martí 2013-11-04 10:22:22 +01:00
parent 65e708908e
commit fc804e68d2
3 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/common.py
View file

@ -30,17 +30,17 @@ import magic
config = None
options = None
def read_config(opts):
def read_config(opts, config_file='config.py'):
"""Read the repository config
The config is read from config.py, which is in the current directory when
The config is read from config_file, which is in the current directory when
any of the repo management commands are used.
"""
global config, options
if config is not None:
return config
if not os.path.isfile('config.py'):
if not os.path.isfile(config_file):
print "Missing config file - is this a repo directory?"
sys.exit(2)
@ -58,8 +58,8 @@ def read_config(opts):
'max_icon_size': 72,
'stats_to_carbon': False
}
print "Reading config.py..."
execfile('config.py', config)
print "Reading %s..." % config_file
execfile(config_file, config)
return config