openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #09778
[Merge] lp:~smpettit/openlp/packaging into lp:openlp
Stevan Pettit has proposed merging lp:~smpettit/openlp/packaging into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~smpettit/openlp/packaging/+merge/63403
Fixed traceback error that occurs in windows-builder.py if the bzr version info contains non-ascii characters.
--
https://code.launchpad.net/~smpettit/openlp/packaging/+merge/63403
Your team OpenLP Core is requested to review the proposed merge of lp:~smpettit/openlp/packaging into 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:21:23 +0000
@@ -194,7 +194,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)
Follow ups