Merge lp://qastaging/~dobey/ubuntu-app-launch/fix-legacy into lp://qastaging/ubuntu-app-launch/16.10

Proposed by dobey
Status: Merged
Approved by: Ted Gould
Approved revision: 232
Merged at revision: 231
Proposed branch: lp://qastaging/~dobey/ubuntu-app-launch/fix-legacy
Merge into: lp://qastaging/ubuntu-app-launch/16.10
Diff against target: 51 lines (+25/-2)
1 file modified
libubuntu-app-launch/application-impl-legacy.cpp (+25/-2)
To merge this branch: bzr merge lp://qastaging/~dobey/ubuntu-app-launch/fix-legacy
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Needs Fixing
Ted Gould (community) Approve
Review via email: mp+301222@code.qastaging.launchpad.net

Commit message

Strip the extra .desktop off of legacy app IDs when loading .desktop files.

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Looks good, let's get this fix in. Thanks for cherry picking it!

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

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

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

review: Needs Fixing (continuous-integration)

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