summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2011-08-05 18:34:11 +0100
committerLars Wirzenius <liw@liw.fi>2011-08-05 18:34:11 +0100
commit84fadb42c9b922c3504fe8ed0c045dceed47e886 (patch)
treedf0d01aa536eee78a8b6b4b0fe2f52aabbc5c320
parent8f345be1536c2fe9511d32ee68ee0e0908ab8d6a (diff)
downloadobnam-84fadb42c9b922c3504fe8ed0c045dceed47e886.tar.gz
Make better error message if trying to use encrypted repository without encryption.
-rw-r--r--obnamlib/repo.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/obnamlib/repo.py b/obnamlib/repo.py
index b05fd736..ddec4a46 100644
--- a/obnamlib/repo.py
+++ b/obnamlib/repo.py
@@ -271,7 +271,14 @@ class Repository(object):
if self.fs.exists('metadata/format'):
data = self.fs.cat('metadata/format')
lines = data.splitlines()
- version = int(lines[0])
+ line = lines[0]
+ try:
+ version = int(line)
+ except ValueError, e:
+ msg = ('Invalid repository format version (%s) -- '
+ 'forgot encryption?' %
+ repr(line))
+ raise obnamlib.AppException(msg)
return version
else:
return None