Merge branch 'master' of ssh://github.com/research/chocolate

This commit is contained in:
Seth Schoen 2012-11-18 22:12:48 -08:00
commit 5d9e08964b

View file

@ -65,8 +65,12 @@ def choice_of_ca():
return result
def get_cas():
with open("trustify/client/.ca_offerings") as f:
choices = [line.split(";", 1) for line in f]
try:
with open("trustify/client/.ca_offerings") as f:
choices = [line.split(";", 1) for line in f]
except IOError as e:
logger.fatal("Unable to find .ca_offerings file")
sys.exit(1)
return choices