copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

prevent traceback when check update from ftp. see https://trac.gajim.org/ticket/7023#comment:13

Browse source
This commit is contained in:
Denis Fomin 2011-11-11 21:55:46 +03:00
parent 844c66e08e
commit 159dbdbe92
1 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/plugin_installer/plugin_installer.py
View file

@ -81,6 +81,7 @@ class PluginInstaller(GajimPlugin):
@log_calls('PluginInstallerPlugin') @log_calls('PluginInstallerPlugin')
def check_update(self): def check_update(self):
def _run(): def _run():
try:
to_update = [] to_update = []
con = ftplib.FTP_TLS(ftp.server) con = ftplib.FTP_TLS(ftp.server)
con.login() con.login()
@ -95,8 +96,8 @@ class PluginInstaller(GajimPlugin):
if str(error).startswith('550'): if str(error).startswith('550'):
continue continue
ftp.config.readfp(io.BytesIO(ftp.buffer_.getvalue())) ftp.config.readfp(io.BytesIO(ftp.buffer_.getvalue()))
local_version = ftp.get_plugin_version(ftp.config.get('info', local_version = ftp.get_plugin_version(ftp.config.get(
'name')) 'info', 'name'))
if local_version: if local_version:
local = convert_version_to_list(local_version) local = convert_version_to_list(local_version)
remote = convert_version_to_list(ftp.config.get('info', remote = convert_version_to_list(ftp.config.get('info',
@ -105,6 +106,9 @@ class PluginInstaller(GajimPlugin):
to_update.append(ftp.config.get('info', 'name')) to_update.append(ftp.config.get('info', 'name'))
con.quit() con.quit()
gobject.idle_add(self.warn_update, to_update) gobject.idle_add(self.warn_update, to_update)
except Exception, e:
WarningDialog(_('Ftp error'), str(e),
gajim.interface.roster.window)
ftp = Ftp(self) ftp = Ftp(self)
ftp.run = _run ftp.run = _run
ftp.start() ftp.start()