ubuntu-download-manager

Merge lp://staging/~michael-sheldon/ubuntu-download-manager/snap into lp://staging/ubuntu-download-manager

  1. snap
  2. Merge into trunk
Proposed by Michael Sheldon
Status: Merged
Approved by: Bill Filler
Approved revision: 378
Merged at revision: 379
Proposed branch: lp://staging/~michael-sheldon/ubuntu-download-manager/snap
Merge into: lp://staging/ubuntu-download-manager
Diff against target: 115 lines (+62/-3)
6 files modified
debian/ubuntu-download-manager.install (+1/-0)
snapcraft.yaml (+32/-0)
src/common/priv/ubuntu/transfers/system/apparmor.cpp (+15/-3)
src/downloads/daemon/CMakeLists.txt (+6/-0)
src/downloads/daemon/com.canonical.applications.Downloader.service (+1/-0)
src/downloads/daemon/ubuntu-download-manager-systemd.service (+7/-0)
To merge this branch: bzr merge lp://staging/~michael-sheldon/ubuntu-download-manager/snap
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Lukáš Tinkl (community) Needs Fixing
Review via email: mp+311611@code.staging.launchpad.net

Commit message

Add support for building as a snap

Description of the change

Add support for building as a snap

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:376
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-download-manager-ci/21/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2046/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2049
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1879
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1879/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1879
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1879/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1879/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1879
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1879/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1879
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1879/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1879/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1879
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1879/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1879
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1879/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1879/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-download-manager-ci/21/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~michael-sheldon/ubuntu-download-manager/snap updated
377. By Michael Sheldon

Add systemd service file to allow for dbus activation in snap

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:377
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-download-manager-ci/23/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2072/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2075
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1905
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1905/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1905
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1905/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1905/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1905
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1905/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1905
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1905/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1905/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1905
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1905/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1905
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1905/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1905/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-download-manager-ci/23/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

+ if (QDir::homePath().contains(QString("snap%1ubuntu-download-manager").arg(QDir::separator()))) {

The usage of QDir::separator() is really discouraged, you could as well write a much simpler version:

+ if (QDir::homePath().contains(QStringLiteral("snap/ubuntu-download-manager"))) {

review: Needs Fixing
lp://staging/~michael-sheldon/ubuntu-download-manager/snap updated
378. By Michael Sheldon

Remove use of QDir::separator()

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

I've updated the branch to remove the use of QDir::separator(), I'm curious as to why it's discouraged though? I can see in the case of snap things it's probably unimportant, but separator() would appear to be a more platform agnostic approach in general for applications that may be running on systems with a different separator character (e.g. Windows)

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

It's handled automatically by Qt, see http://doc.qt.io/qt-5/qdir.html#separator

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Oh, that's great, I was aware of that; thanks :)

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Edit: *wasn't* aware of that

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:378
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-download-manager-ci/24/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2077/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2080
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1910
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1910/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1910
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1910/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1910/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1910
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1910/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1910
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1910/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1910/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1910
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1910/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1910
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1910/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1910/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-download-manager-ci/24/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