ubuntu-download-manager

Merge lp:~michael-sheldon/ubuntu-download-manager/fix-1607382 into lp:ubuntu-download-manager

  1. fix-1607382
  2. Merge into trunk
Proposed by Michael Sheldon
Status: Merged
Approved by: Jonas G. Drange
Approved revision: 363
Merged at revision: 366
Proposed branch: lp:~michael-sheldon/ubuntu-download-manager/fix-1607382
Merge into: lp:ubuntu-download-manager
Prerequisite: lp:~jonas-drange/ubuntu-download-manager/retrieve-metadata
Diff against target: 38 lines (+7/-0)
3 files modified
src/common/priv/ubuntu/transfers/transfer.cpp (+5/-0)
src/common/priv/ubuntu/transfers/transfer.h (+1/-0)
src/downloads/priv/ubuntu/downloads/download.h (+1/-0)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-download-manager/fix-1607382
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+302164@code.launchpad.net

Commit message

Set transfer app id when updating the download owner

Description of the change

Set transfer app id when updating the download owner

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:366
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-download-manager-ci/10/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1146/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1146
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1034
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1034
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1034
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1023
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1023/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1023
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1023/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1023/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1023
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1023/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1023
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1023/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1023/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1023
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1023/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1023
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1023/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1023/console

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

review: Needs Fixing (continuous-integration)
lp:~michael-sheldon/ubuntu-download-manager/fix-1607382 updated
363. By Michael Sheldon

Set transfer app id when updating the download owner

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/common/priv/ubuntu/transfers/transfer.cpp'
2--- src/common/priv/ubuntu/transfers/transfer.cpp 2015-10-30 17:01:03 +0000
3+++ src/common/priv/ubuntu/transfers/transfer.cpp 2016-08-08 12:01:27 +0000
4@@ -55,6 +55,11 @@
5 return _appId;
6 }
7
8+void
9+Transfer::setTransferAppId(QString appId) {
10+ _appId = appId;
11+}
12+
13 QString
14 Transfer::path() const {
15 return _dbusPath;
16
17=== modified file 'src/common/priv/ubuntu/transfers/transfer.h'
18--- src/common/priv/ubuntu/transfers/transfer.h 2015-12-10 20:47:34 +0000
19+++ src/common/priv/ubuntu/transfers/transfer.h 2016-08-08 12:01:27 +0000
20@@ -50,6 +50,7 @@
21
22 virtual QString transferId() const;
23 virtual QString transferAppId() const;
24+ virtual void setTransferAppId(QString appId);
25 virtual QString path() const;
26 virtual bool isConfined() const;
27 virtual QString rootPath() const;
28
29=== modified file 'src/downloads/priv/ubuntu/downloads/download.h'
30--- src/downloads/priv/ubuntu/downloads/download.h 2015-12-10 20:47:34 +0000
31+++ src/downloads/priv/ubuntu/downloads/download.h 2016-08-08 12:01:27 +0000
32@@ -100,6 +100,7 @@
33 }
34
35 virtual void setDownloadOwner(const QString& owner) {
36+ setTransferAppId(owner);
37 _destinationApp = owner;
38 }
39

Subscribers

People subscribed via source and target branches