openlp-core team mailing list archive

[Jonathan Springer <springermac@xxxxxxxxx>]

Jonathan Springer has proposed merging lp:~springermac/openlp/packaging into lp:openlp/packaging.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~springermac/openlp/packaging/+merge/272668

Fix windows-builder
Fix ssl hook due to PyInstaller changes
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~springermac/openlp/packaging into lp:openlp/packaging.

=== modified file 'pyinstaller-hooks/hook-ssl.py'
--- pyinstaller-hooks/hook-ssl.py	2015-08-24 00:53:43 +0000
+++ pyinstaller-hooks/hook-ssl.py	2015-09-28 21:37:18 +0000
@@ -1,5 +1,5 @@
 from PyInstaller.compat import is_darwin
-from PyInstaller.utils.hooks.hookutils import exec_statement
+from PyInstaller.utils.hooks import exec_statement
 
 if is_darwin:  # TODO check if this is needed on linux
     datas = []

=== modified file 'windows/windows-builder.py'
--- windows/windows-builder.py	2015-08-24 00:53:43 +0000
+++ windows/windows-builder.py	2015-09-28 21:37:18 +0000
@@ -306,8 +306,6 @@
             cmd.append('--log-level=ERROR')
         else:
             cmd.append('--log-level=DEBUG')
-        if self.args.devel:
-            cmd.append('-d')
         pyinstaller = Popen(cmd, stdout=PIPE)
         output = pyinstaller.communicate()[0]
         code = pyinstaller.wait()