Merge lp:~kissiel/checkbox/fix-1556337-conf-files-ignored into lp:checkbox
Status: | Merged |
---|---|
Approved by: | Sylvain Pineau |
Approved revision: | 4279 |
Merged at revision: | 4275 |
Proposed branch: | lp:~kissiel/checkbox/fix-1556337-conf-files-ignored |
Merge into: | lp:checkbox |
Diff against target: |
193 lines (+69/-39) 3 files modified
checkbox-ng/checkbox_ng/launcher.py (+1/-0) checkbox-ng/docs/launcher-tutorial.rst (+11/-0) checkbox-ng/launchers/checkbox-cli (+57/-39) |
To merge this branch: | bzr merge lp:~kissiel/checkbox/fix-1556337-conf-files-ignored |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sylvain Pineau (community) | Approve | ||
Review via email:
|
Description of the change
This MR fixes a problem where config files where ignored.
Now the cascade is back. ~/.config contents override /etc/xdg/ contents and launcher contents override both.
Note that config files are expected to use the same syntax as launchers.
bb124e0 checkbox-
44e4432 checkbox-
c607367 checkbox-
1de2867 checkbox-
88af98b checkbox-ng:docs: add info about supplying secure_id for stock reports
7f99d7f checkbox-
Thanks a lot for the fix, tested ok.