github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1178 from modoboa/feature/find_extension_settings

Browse Source 
core: include extension settings in every case.
This commit is contained in:
Antoine Nguyen
2017-07-07 09:37:47 +02:00
committed by GitHub
parent d43eec2645 27f2eb0592
commit ce471022a0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/core/commands/deploy.py
+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(