Merge lp://staging/~ted/ubuntu-app-launch/recoverable-whoopsie into lp://staging/ubuntu-app-launch

Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 215
Merged at revision: 268
Proposed branch: lp://staging/~ted/ubuntu-app-launch/recoverable-whoopsie
Merge into: lp://staging/ubuntu-app-launch
Diff against target: 431 lines (+21/-307)
7 files modified
CMakeLists.txt (+6/-3)
debian/control (+1/-0)
desktop-hook.c (+12/-110)
helpers-shared.c (+0/-1)
libubuntu-app-launch/recoverable-problem.c (+0/-165)
libubuntu-app-launch/recoverable-problem.h (+0/-26)
libubuntu-app-launch/ubuntu-app-launch.cpp (+2/-2)
To merge this branch: bzr merge lp://staging/~ted/ubuntu-app-launch/recoverable-whoopsie
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
unity-api-1-bot continuous-integration Needs Fixing
dobey (community) Needs Fixing
PS Jenkins bot continuous-integration Pending
Larry Price Pending
Review via email: mp+310212@code.staging.launchpad.net

This proposal supersedes a proposal from 2016-05-09.

Commit message

Switch to libwhoopsie for recoverable problem support

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
Larry Price (larryprice) wrote : Posted in a previous version of this proposal

Couple of CMake comments and a more general properties list thing.

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:211
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/21/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/282/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/288
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/222
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/222
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/222
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/151/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/151
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/151/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/151
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/151/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/151/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/151/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/151/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/151/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/151/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/151
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/151/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/21/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
dobey (dobey) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
dobey (dobey) wrote : Posted in a previous version of this proposal

Err, actually it looks like the necessary whoopsie API changes are missing from vivid+overlay, so either whoopsie also needs backported, or this has to wait until we can drop vivid for good.

review: Needs Fixing
Revision history for this message
Ted Gould (ted) wrote : Posted in a previous version of this proposal

On Mon, 2016-08-15 at 19:25 +0000, Rodney Dawes wrote:
> Err, actually it looks like the necessary whoopsie API changes are
> missing from vivid+overlay, so either whoopsie also needs backported,
> or this has to wait until we can drop vivid for good.
Yeah, that's why this one has been sitting for a while. We'd need to
update whoopsie a few versions to pull it into Vivid and I'm not sure I
want to deal with all that :-)

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
dobey (dobey) wrote :

Conflicts. Also please add a version requirement to libwhoopsie-dev in debian/control to depend only on versions new enough to have the required API.

review: Needs Fixing
212. By Ted Gould

Merge trunk

213. By Ted Gould

Putting in whoopsie versions

214. By Ted Gould

Adding whoopsie libs to the desktop hook

215. By Ted Gould

Whoopsie doesn't have a reasonable version number in pkgconfig

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:215
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/116/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1036/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1043
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/834/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/834
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/834/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/834
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/834/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/834/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/834
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/834/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/834/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/834/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/834
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/834/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/834
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/834/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/116/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

Very nice cleanup, I need to do this in indicator-session as well.

* I /would/ ask for a pkg-config version check as well as the one dobey suggested for debian/control, but it looks like pkg-config --modversion libwhoopsie returns 0.0.0. :|

* Minor bikeshed, it would be easier to read / less likely to break if indices renumber if you defined properties' values inline, e.g.:

const char * proeprties[] = {
    "IconValue", originalicon,
    "AppID", app_id,
    "IconPath", iconpath,
    "IconField", iconfield,
    NULL
};

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches