Reviewers: ,


Please review this at http://codereview.tryton.org/38011/

Affected files:
  M tryton/common/common.py
  M tryton/gui/window/dblogin.py


Index: tryton/common/common.py
===================================================================

--- a/tryton/common/common.py
+++ b/tryton/common/common.py
@@ -128,6 +128,10 @@
             return val
     return name

+def test_server_version(host, port):
+    version = rpc.server_version(host, port)
+    return version.split('.')[:2] == VERSION.split('.')[:2]
+
 def refresh_dblist(host, port):
     '''
     Return the number of database available
@@ -135,10 +139,8 @@
         or -1 if the server version doesn't match the client version
     '''
     rpc.logout()
-    version = rpc.server_version(host, port)
-    if hasattr(version, 'split'):
-        if version.split('.')[:2] != VERSION.split('.')[:2]:
-            return -1
+    if not test_server_version(host, port):
+        return -1
     return rpc.db_list(host, port)

 def refresh_langlist(lang_widget, host, port):

Index: tryton/gui/window/dblogin.py
===================================================================

--- a/tryton/gui/window/dblogin.py
+++ b/tryton/gui/window/dblogin.py
@@ -592,6 +592,8 @@
                 port = int(port)
             except ValueError:
                 continue
+            if not common.test_server_version(host, port):
+                continue
             database = self.entry_database.get_text()
             login = self.entry_login.get_text()
             CONFIG['login.server'] = host



--
[email protected] mailing list

Reply via email to