from libcloud.storage.types import Provider, ContainerDoesNotExistError
from libcloud.storage.providers import get_driver
- if 'awsaccesskeyid' not in config or 'awssecretkey' not in config:
+ if not config.get('awsaccesskeyid') or not config.get('awssecretkey'):
logging.error('To use awsbucket, you must set awssecretkey and awsaccesskeyid in config.py!')
sys.exit(1)
awsbucket = config['awsbucket']
logging.critical("The only commands currently supported are 'init' and 'update'")
sys.exit(1)
- if 'nonstandardwebroot' in config and config['nonstandardwebroot'] == True:
+ if config.get('nonstandardwebroot') == True:
standardwebroot = False
else:
standardwebroot = True
- if 'serverwebroot' in config:
+ if config.get('serverwebroot'):
serverwebroot = config['serverwebroot']
host, fdroiddir = serverwebroot.rstrip('/').split(':')
serverrepobase = os.path.basename(fdroiddir)
+ serverwebroot.rstrip('/') + '/fdroid\n\t'
+ serverwebroot.rstrip('/').rstrip(serverrepobase) + 'fdroid')
sys.exit(1)
- elif 'awsbucket' not in config:
+ elif not config.get('awsbucket'):
logging.warn('No serverwebroot or awsbucket set! Edit your config.py to set one or both.')
sys.exit(1)
repo_sections.append('archive')
if args[0] == 'init':
- if serverwebroot != None:
+ if config.get('serverwebroot'):
sshargs = ['ssh']
if options.quiet:
sshargs += ['-q']
sys.exit(1)
elif args[0] == 'update':
for repo_section in repo_sections:
- if 'serverwebroot' in config:
+ if config.get('serverwebroot'):
update_serverwebroot(repo_section)
- if 'awsbucket' in config:
+ if config.get('awsbucket'):
update_awsbucket(repo_section)
sys.exit(0)