kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-17 10:40:12 +02:00
Code Activity

fix E713 test for membership should be 'not in'

Browse Source
This commit is contained in:
Daniel Martí 2015-05-22 09:29:51 +02:00
parent 6196e8acc1
commit 550d907b8c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fdroidserver/update.py
View File

@ -744,16 +744,16 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
repoel.setAttribute("timestamp", str(int(time.time()))) repoel.setAttribute("timestamp", str(int(time.time())))
nosigningkey = False nosigningkey = False
if not 'repo_keyalias' in config: if 'repo_keyalias' not in config:
nosigningkey = True nosigningkey = True
logging.critical("'repo_keyalias' not found in config.py!") logging.critical("'repo_keyalias' not found in config.py!")
if not 'keystore' in config: if 'keystore' not in config:
nosigningkey = True nosigningkey = True
logging.critical("'keystore' not found in config.py!") logging.critical("'keystore' not found in config.py!")
if not 'keystorepass' in config and not 'keystorepassfile' in config: if 'keystorepass' not in config and 'keystorepassfile' not in config:
nosigningkey = True nosigningkey = True
logging.critical("'keystorepass' not found in config.py!") logging.critical("'keystorepass' not found in config.py!")
if not 'keypass' in config and not 'keypassfile' in config: if 'keypass' not in config and 'keypassfile' not in config:
nosigningkey = True nosigningkey = True
logging.critical("'keypass' not found in config.py!") logging.critical("'keypass' not found in config.py!")
if not os.path.exists(config['keystore']): if not os.path.exists(config['keystore']):
@ -1072,21 +1072,21 @@ def main():
logging.critical("\t'" + config['keystore'] + "'") logging.critical("\t'" + config['keystore'] + "'")
sys.exit(1) sys.exit(1)
if not 'repo_keyalias' in config: if 'repo_keyalias' not in config:
config['repo_keyalias'] = socket.getfqdn() config['repo_keyalias'] = socket.getfqdn()
common.write_to_config(config, 'repo_keyalias', config['repo_keyalias']) common.write_to_config(config, 'repo_keyalias', config['repo_keyalias'])
if not 'keydname' in config: if 'keydname' not in config:
config['keydname'] = 'CN=' + config['repo_keyalias'] + ', OU=F-Droid' config['keydname'] = 'CN=' + config['repo_keyalias'] + ', OU=F-Droid'
common.write_to_config(config, 'keydname', config['keydname']) common.write_to_config(config, 'keydname', config['keydname'])
if not 'keystore' in config: if 'keystore' not in config:
config['keystore'] = common.default_config.keystore config['keystore'] = common.default_config.keystore
common.write_to_config(config, 'keystore', config['keystore']) common.write_to_config(config, 'keystore', config['keystore'])
password = common.genpassword() password = common.genpassword()
if not 'keystorepass' in config: if 'keystorepass' not in config:
config['keystorepass'] = password config['keystorepass'] = password
common.write_to_config(config, 'keystorepass', config['keystorepass']) common.write_to_config(config, 'keystorepass', config['keystorepass'])
if not 'keypass' in config: if 'keypass' not in config:
config['keypass'] = password config['keypass'] = password
common.write_to_config(config, 'keypass', config['keypass']) common.write_to_config(config, 'keypass', config['keypass'])
common.genkeystore(config) common.genkeystore(config)