Merge lp://staging/click into lp://staging/~ubuntu-managed-branches/click/click
| Status: | Merged |
|---|---|
| Merged at revision: | 349 |
| Proposed branch: | lp://staging/click |
| Merge into: | lp://staging/~ubuntu-managed-branches/click/click |
| Diff against target: |
1225 lines (+428/-73) 22 files modified
click/chroot.py (+49/-11) click/commands/chroot.py (+21/-10) click/commands/hook.py (+22/-7) click/commands/info.py (+1/-1) click/commands/install.py (+1/-1) click/commands/list.py (+1/-1) click/commands/pkgdir.py (+1/-1) click/commands/register.py (+1/-1) click/commands/unregister.py (+1/-1) click/install.py (+2/-1) click/tests/test_database.py (+28/-0) click/tests/test_hooks.py (+24/-16) click/tests/test_install.py (+2/-2) click/tests/test_user.py (+31/-8) debian/changelog (+25/-0) debian/libclick-0.4-0.symbols (+5/-0) init/upstart/click-user-hooks.conf.in (+1/-1) lib/click/click.sym (+5/-0) lib/click/database.vala (+94/-1) lib/click/framework.vala (+8/-0) lib/click/hooks.vala (+45/-7) lib/click/user.vala (+60/-3) |
| To merge this branch: | bzr merge lp://staging/click |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stéphane Graber | Pending | ||
|
Review via email:
|
|||
Commit message
Click 0.4.21: Added manifest methods so that clients can avoid JSON-GLib; handle some crashes more gracefully; run user hooks after dbus to fix the content-hub hook; fix backports to pre-trusty.
Description of the change
* Add *_as_string variants of manifest methods, for clients that already
have their own JSON parsing libraries and don't want to use JSON-GLib.
* Write to stderr and exit non-zero when chrooted commands fail, rather
than propagating an exception which is then logged as a click crash
(LP: #1298457).
* Make the get_manifests family of functions log errors about individual
manifests to stderr rather than crashing (LP: #1297519).
* Don't run user hooks until dbus has started; the content-hub hook needs
to modify gsettings.
* Don't rely on PyGObject supporting default None arguments; this was only
added in 3.11.1.
