greatbody
/
glances
mirror of https://github.com/nicolargo/glances
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #269 from dongweiming/master 

Fix broken test server-client
pull/263/merge
Alessio Sergi 2013-08-02 03:28:03 -07:00
parent 023bbcea81 2224b866d2
commit 686cc7690c
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glances/glances.py
View File

@ -4002,7 +4002,7 @@ class GlancesClient():
def client_init(self):
try:
self.client.init()
client_version = self.client.init()
except ProtocolError as err:
if str(err).find(" 401 ") > 0:
print(_("Error: Connection to server failed. Bad password."))
@ -4010,13 +4010,7 @@ class GlancesClient():
else:
print(_("Error: Connection to server failed. Unknown error."))
sys.exit(-1)
try:
client_version = self.client.init()[:3]
except:
print(_("Error: Connection to server failed. Can not get the server version."))
sys.exit(-1)
else:
return __version__[:2] == client_version[:2]
return __version__[:3] == client_version[:3]
def client_get_limits(self):
try: