combox

split and encrypted files between online file storage providers
git clone git://git.ricketyspace.net/combox.git
Log | Files | Refs

commit 091cc84f18b3214d4e94a83a011e6e85572c9884
parent a03dd53e7297d730a17e40587866d57b0140dec1
Author: Siddharth Ravikumar <sravik@bgsu.edu>
Date:   Tue, 22 Dec 2015 17:05:33 -0500

Fixed try-catch block in combox.cbox.main.

Diffstat:
ChangeLog | 5+++++
combox/_version.py | 2+-
combox/cbox.py | 5+++--
3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog @@ -1,5 +1,10 @@ 2015-12-22 Siddharth Ravikumar <sravik@bgsu.edu> + * combox/cbox.py (main): Added `IOError` in the catch block that + handles errors when opening the combox configuration file. + +2015-12-22 Siddharth Ravikumar <sravik@bgsu.edu> + * README.rst: fixed lint errors. 2015-12-22 Siddharth Ravikumar <sravik@bgsu.edu> diff --git a/combox/_version.py b/combox/_version.py @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/>. __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 @@ -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.