← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~raoul-snyman/openlp/pyinstaller-change into lp:openlp/packaging

 

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/pyinstaller-change into lp:openlp/packaging.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/pyinstaller-change/+merge/313373

Make debug mode explicit.
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/pyinstaller-change into lp:openlp/packaging.
=== modified file 'builders/builder.py'
--- builders/builder.py	2016-12-09 09:52:33 +0000
+++ builders/builder.py	2016-12-15 15:41:14 +0000
@@ -159,6 +159,7 @@
                             help='Do NOT update the branch before building')
         parser.add_argument('--skip-translations', action='store_true', default=False,
                             help='Do NOT update the language translation files')
+        parser.add_argument('--debug', action='store_true', default=False, help='Create a debug build')
         self.add_extra_args(parser)
         self.args = parser.parse_args()
 
@@ -232,7 +233,7 @@
         self._print_verbose('   {:.<20} {}'.format('build path: ', self.build_path))
         self._print_verbose('Overrides:')
         self._print_verbose('   {:.<20} {}'.format('branch **: ', self.branch_path))
-        self._print_verbose('   {:.<20} {}'.format('documentation **: ', self.branch_path))
+        self._print_verbose('   {:.<20} {}'.format('documentation **: ', self.documentation_path))
         self._print_verbose('   {:.<20} {}'.format('version: ', self.version))
         self._print_verbose('   {:.<20} {}'.format('work path: ', self.work_path))
 
@@ -279,11 +280,11 @@
                '-i', self.icon_path,
                '-n', 'OpenLP',
                self.openlp_script]
-        if not self.args.verbose:
+        if self.args.verbose:
+            cmd.append('--log-level=DEBUG')
+        else:
             cmd.append('--log-level=ERROR')
-        else:
-            cmd.append('--log-level=DEBUG')
-        if not self.args.release:
+        if self.args.debug:
             cmd.append('-d')
         self._print_verbose('... {}'.format(' '.join(cmd)))
         output, error = self._run_command(cmd, 'Error running PyInstaller')


Follow ups