core: include extension settings in every case.

see #1177
This commit is contained in:
Antoine Nguyen
2017-07-05 22:29:02 +02:00
parent 4d23ebf9de
commit 00ea4eb459
2 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -41,7 +41,7 @@ before_script:
- ldapadd -h localhost:3389 -D cn=admin,dc=example,dc=com -w test -f test_data/base.ldif
script:
- python ./tests.py
- coverage run --source ../modoboa ./tests.py
- cd test_project
- coverage run --source ../modoboa manage.py test modoboa.core modoboa.lib modoboa.admin modoboa.limits modoboa.relaydomains
+4 -3
View File
@@ -172,8 +172,6 @@ class DeployCommand(Command):
include in the final configuration.
"""
pip_args = ["install"] + [extension[0] for extension in extensions]
pip.main(pip_args)
extra_settings = []
for extension in extensions:
module = __import__(extension[1], locals(), globals(), [])
@@ -225,7 +223,10 @@ class DeployCommand(Command):
extensions = [(extension, extension.replace("-", "_"))
for extension in extensions]
if not parsed_args.dont_install_extensions:
extra_settings = self.install_extensions(extensions)
pip_args = (
["install"] + [extension[0] for extension in extensions])
pip.main(pip_args)
extra_settings = self.find_extra_settings(extensions)
extensions = [extension[1] for extension in extensions]
bower_components_dir = os.path.realpath(