Merge pull request #72 from v3aqb/dev

fix bug when no config file exists
This commit is contained in:
clowwindy 2013-10-14 06:58:15 -07:00
commit 6fb09ea8af
2 changed files with 5 additions and 0 deletions

View file

@ -178,6 +178,9 @@ def main():
logging.info('loading config from %s' % config_path)
with open(config_path, 'rb') as f:
config = json.load(f)
else:
config = {}
optlist, args = getopt.getopt(sys.argv[1:], 's:b:p:k:l:m:c:6')
for key, value in optlist:
if key == '-p':

View file

@ -153,6 +153,8 @@ def main():
with open(config_path, 'rb') as f:
config = json.load(f)
logging.info('loading config from %s' % config_path)
else:
config = {}
optlist, args = getopt.getopt(sys.argv[1:], 's:p:k:m:c:6')
for key, value in optlist: