Skip to content
Snippets Groups Projects
Commit 3749559d authored by Philipp Hörist's avatar Philipp Hörist
Browse files

Merge branch 'master' into 'master'

[plugin_installer] Fix automatic update check

See merge request !8
parents 1b49da55 6004a632
No related branches found
No related tags found
No related merge requests found
...@@ -123,7 +123,8 @@ class PluginInstaller(GajimPlugin): ...@@ -123,7 +123,8 @@ class PluginInstaller(GajimPlugin):
config.readfp(zip_file.open(filename)) config.readfp(zip_file.open(filename))
if not config.has_section('info'): if not config.has_section('info'):
continue continue
plugins.add(config) plugins.append(config)
return plugins
def retrieve_path(self, directory, fname): def retrieve_path(self, directory, fname):
server = self.config['http_server'] server = self.config['http_server']
...@@ -167,8 +168,8 @@ class PluginInstaller(GajimPlugin): ...@@ -167,8 +168,8 @@ class PluginInstaller(GajimPlugin):
if remote > local: if remote > local:
to_update.append(config.get('info', 'name')) to_update.append(config.get('info', 'name'))
gobject.idle_add(self.warn_update, to_update) gobject.idle_add(self.warn_update, to_update)
except Exception, e: except Exception as e:
log.debug('Ftp error when check updates: %s' % str(e)) log.exception('Ftp error when check for updates: ')
ftp = Ftp(self) ftp = Ftp(self)
ftp.run = _run ftp.run = _run
ftp.start() ftp.start()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment