From eca896a2e8b73d9a59aa1d18490ca7de3c2ac5e2 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Wed, 20 May 2015 21:25:54 -0400 Subject: [PATCH] Fix missing import and pass before_install correctly. --- plinth/modules/xmpp/xmpp.py | 3 ++- plinth/views.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plinth/modules/xmpp/xmpp.py b/plinth/modules/xmpp/xmpp.py index 9b6e642de..90c88b541 100644 --- a/plinth/modules/xmpp/xmpp.py +++ b/plinth/modules/xmpp/xmpp.py @@ -22,6 +22,7 @@ from django.core.urlresolvers import reverse_lazy from django.template.response import TemplateResponse from gettext import gettext as _ import logging +import socket from plinth import actions from plinth import cfg @@ -65,7 +66,7 @@ def before_install(): """Preseed debconf values before the packages are installed.""" fqdn = socket.getfqdn() domainname = '.'.join(fqdn.split('.')[1:]) - LOGGER.info('XMPP service domainname will be ', domainname) + LOGGER.info('XMPP service domainname will be ' + domainname) actions.superuser_run('xmpp', ['pre-install', '--domainname', domainname]) diff --git a/plinth/views.py b/plinth/views.py index af32e0b4f..cfbbd608b 100644 --- a/plinth/views.py +++ b/plinth/views.py @@ -56,6 +56,8 @@ class PackageInstallView(TemplateView): Start the package installation, and refresh the page every x seconds to keep displaying PackageInstallView.get() with the installation status. """ - package_module.start_install(self.kwargs['package_names'], - on_install=self.kwargs.get('on_install')) + package_module.start_install( + self.kwargs['package_names'], + before_install=self.kwargs.get('before_install'), + on_install=self.kwargs.get('on_install')) return self.render_to_response(self.get_context_data())