Display both names when reporting a difference.

b0fe461d · Vincent Pelletier · 03ae3309 · b0fe461d
Commit b0fe461d authored Feb 23, 2012 by Vincent Pelletier
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

neo/storage/app.py neo/storage/app.py +5 -2

No files found.
--- a/neo/storage/app.py
+++ b/neo/storage/app.py
@@ -130,10 +130,13 @@ class Application(object):
        # check cluster name
        try:
-            if dm.getName() != self.name:
+            dm_name = dm.getName()
-                raise RuntimeError('name does not match with the database')
        except KeyError:
            dm.setName(self.name)
+        else:
+            if dm_name != self.name:
+                raise RuntimeError('name %r does not match with the '
+                    'database: %r' % (self.name, dm_name))
        # load configuration
        self.uuid = NoneOnKeyError(dm.getUUID)