Merge lp:~michael.nelson/ubuntu-webcatalog/1180770-handle-incorrect-desktop-files into lp:ubuntu-webcatalog
Proposed by
Michael Nelson
Status: | Merged |
---|---|
Approved by: | Martin Albisetti |
Approved revision: | 185 |
Merged at revision: | 184 |
Proposed branch: | lp:~michael.nelson/ubuntu-webcatalog/1180770-handle-incorrect-desktop-files |
Merge into: | lp:ubuntu-webcatalog |
Diff against target: |
83 lines (+41/-2) 3 files modified
src/webcatalog/forms.py (+9/-2) src/webcatalog/tests/test_data/workrave:workrave.desktop (+16/-0) src/webcatalog/tests/test_forms.py (+16/-0) |
To merge this branch: | bzr merge lp:~michael.nelson/ubuntu-webcatalog/1180770-handle-incorrect-desktop-files |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Albisetti (community) | Approve | ||
Review via email: mp+164881@code.launchpad.net |
Commit message
Invalid desktop files are handled (skipped) rather than erroring.
Description of the change
Invalid desktop files are handled (skipped) rather than erroring.
See the linked bug for a description of the problem.
`fab test`
To post a comment you must log in.