openlp-core team mailing list archive

[jerryb <gerald.britton@xxxxxxxxx>]

jerryb has proposed merging lp:~gerald-britton/openlp/newbugs into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~gerald-britton/openlp/newbugs/+merge/61796

Fixed a bug in Words of Worship import where a file missing the WoW header information would be silently ignored.  With this patch, the user will receive an error message about the file.
-- 
https://code.launchpad.net/~gerald-britton/openlp/newbugs/+merge/61796
Your team OpenLP Core is requested to review the proposed merge of lp:~gerald-britton/openlp/newbugs into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/wowimport.py'
--- openlp/plugins/songs/lib/wowimport.py	2011-04-18 18:03:41 +0000
+++ openlp/plugins/songs/lib/wowimport.py	2011-05-20 16:43:29 +0000
@@ -110,6 +110,7 @@
                 self.title = file_name.rpartition(u'.')[0]
                 songData = open(file, 'rb')
                 if songData.read(19) != u'WoW File\nSong Words':
+                    self.log_error(file)
                     continue
                 # Seek to byte which stores number of blocks in the song
                 songData.seek(56)