openlp-core team mailing list archive

[Stevan Pettit <smpettit@xxxxxxxxxxxxxxx>]

Stevan Pettit has proposed merging lp:~smpettit/openlp/packaging into lp:openlp.

Requested reviews:
  Tim Bentley (trb143)

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

Fixed traceback error that occurs in windows-builder.py if the bzr version info contains non-ascii characters.

Added Mako requirement documentation
-- 
https://code.launchpad.net/~smpettit/openlp/packaging/+merge/63405
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'scripts/windows-builder.py'
--- scripts/windows-builder.py	2011-05-25 07:23:01 +0000
+++ scripts/windows-builder.py	2011-06-03 16:44:28 +0000
@@ -102,6 +102,13 @@
     the install will fail.  The dll can be obtained from here:
     http://www.vincenzo.net/isxkb/index.php?title=PSVince)
 
+Mako    
+    Mako Templates for Python.  This package is required for building the
+    remote plugin.  It can be installed by going to your
+    python_directory\scripts\.. and running "easy_install Mako".  If you do not
+    have easy_install, the Mako package can be obtained here:
+    http://www.makotemplates.org/download.html
+
 """
 
 import os
@@ -194,7 +201,8 @@
     code = bzr.wait()
     if code != 0:
         raise Exception(u'Error running bzr log')
-    latest = output.split(u':')[0]
+    outputAscii = unicode(output, errors='ignore')
+    latest = outputAscii.split(u':')[0]
     versionstring = latest == revision and tag or u'%s-bzr%s' % (tag, latest)
     f = open(os.path.join(dist_path, u'.version'), u'w')
     f.write(versionstring)