Merge lp://qastaging/~tomasgroth/openlp/24bugfix-backport3 into lp://qastaging/openlp/2.4
Proposed by
Tomas Groth
| Status: | Merged |
|---|---|
| Merged at revision: | 2638 |
| Proposed branch: | lp://qastaging/~tomasgroth/openlp/24bugfix-backport3 |
| Merge into: | lp://qastaging/openlp/2.4 |
| Diff against target: |
134 lines (+60/-6) 6 files modified
openlp/plugins/songs/lib/importers/mediashout.py (+5/-3) openlp/plugins/songs/lib/importers/presentationmanager.py (+7/-1) openlp/plugins/songs/lib/importers/songshowplus.py (+7/-1) openlp/plugins/songs/lib/importers/videopsalm.py (+1/-1) tests/functional/openlp_plugins/songs/test_songshowplusimport.py (+2/-0) tests/resources/songshowplussongs/cleanse-me.json (+38/-0) |
| To merge this branch: | bzr merge lp://qastaging/~tomasgroth/openlp/24bugfix-backport3 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Raoul Snyman | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2016-06-16.
Description of the change
Fix traceback in VideoPsalm importers traceback handler.
Skip PresentationManager files we do not support.
Fix MediaShout import issue when an expected table is missing. Fixes bug 1590657.
Fix traceback during songshowplus import. Fixes bug 1585489.
To post a comment you must log in.
Revision history for this message
| Tomas Groth (tomasgroth) wrote | # |
Revision history for this message
| Tomas Groth (tomasgroth) wrote | # |
Revision history for this message
| Raoul Snyman (raoul-snyman) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Tests fails due to bibleserver.com is down.
lp:~tomasgroth/openlp/24bugfix-backport3 (revision 2640)
[SUCCESS] https:/
[SUCCESS] https:/
[FAILURE] https:/
Stopping after failure