diff options
| author | Patrick Totzke <patricktotzke@gmail.com> | 2016-01-31 16:47:19 +0000 |
|---|---|---|
| committer | Patrick Totzke <patricktotzke@gmail.com> | 2016-01-31 16:47:19 +0000 |
| commit | 9ad0125dadd475aecc4f30b9a5b883ad52a8f41c (patch) | |
| tree | 8b4662ba4e5857ab2d8beab387521258a0c0fe7b /alot | |
| parent | 5340700eee4a0e31c20874b5e69ae7a0e014d866 (diff) | |
| parent | bfa71bcd42a8f1a9018aa8c89266ccc574d11f57 (diff) | |
Merge branch '0.3.7-fix-823' into testing
Diffstat (limited to 'alot')
| -rw-r--r-- | alot/addressbook/abook.py | 2 | ||||
| -rw-r--r-- | alot/settings/utils.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/alot/addressbook/abook.py b/alot/addressbook/abook.py index c71f485c..ec706eb3 100644 --- a/alot/addressbook/abook.py +++ b/alot/addressbook/abook.py @@ -15,7 +15,7 @@ class AbookAddressBook(AddressBook): :type path: str """ AddressBook.__init__(self, **kwargs) - DEFAULTSPATH = os.path.join(os.path.dirname(__file__), 'defaults') + DEFAULTSPATH = os.path.join(os.path.dirname(__file__), '..', 'defaults') self._spec = os.path.join(DEFAULTSPATH, 'abook_contacts.spec') path = os.path.expanduser(path) self._config = read_config(path, self._spec) diff --git a/alot/settings/utils.py b/alot/settings/utils.py index f4cfecbc..b6984a7f 100644 --- a/alot/settings/utils.py +++ b/alot/settings/utils.py @@ -27,7 +27,7 @@ def read_config(configpath=None, specpath=None, checks={}): except ConfigObjError as e: raise ConfigError(e) except IOError: - raise ConfigError('Could not read %s' % configpath) + raise ConfigError('Could not read %s and/or %s' % (configpath, specpath)) except UnboundLocalError: # this works around a bug in configobj msg = '%s is malformed. Check for sections without parents..' |