From 091cc84f18b3214d4e94a83a011e6e85572c9884 Mon Sep 17 00:00:00 2001 From: Siddharth Ravikumar Date: Tue, 22 Dec 2015 17:05:33 -0500 Subject: Fixed try-catch block in combox.cbox.main. --- ChangeLog | 5 +++++ combox/_version.py | 2 +- combox/cbox.py | 5 +++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f09bfd..fbae6ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-12-22 Siddharth Ravikumar + + * combox/cbox.py (main): Added `IOError` in the catch block that + handles errors when opening the combox configuration file. + 2015-12-22 Siddharth Ravikumar * README.rst: fixed lint errors. diff --git a/combox/_version.py b/combox/_version.py index 938439d..6038bff 100644 --- a/combox/_version.py +++ b/combox/_version.py @@ -19,7 +19,7 @@ # . __version__ = u"0.2" -__release__ = u"0.rc2" +__release__ = u"0.rc3" def get_version(): diff --git a/combox/cbox.py b/combox/cbox.py index a8891ac..d8775db 100644 --- a/combox/cbox.py +++ b/combox/cbox.py @@ -115,8 +115,9 @@ def main(): try: config = yaml.load(file(config_file, 'r')) - except yaml.YAMLError, exc: - log_e("Error opening configuration file: %r" % exc) + except (IOError, yaml.YAMLError) as exc: + log_e("Unable to open configuration file.") + log_e("Looks like combox is not configured yet. Exiting.") exit(1) # run combox. -- cgit v1.2.3