content-hub

Merge lp:~michael-sheldon/content-hub/set-download-appid into lp:content-hub

  1. set-download-appid
  2. Merge into trunk
Proposed by Michael Sheldon
Status: Merged
Approved by: Ken VanDine
Approved revision: 252
Merged at revision: 261
Proposed branch: lp:~michael-sheldon/content-hub/set-download-appid
Merge into: lp:content-hub
Diff against target: 25 lines (+4/-0)
2 files modified
debian/control (+1/-0)
src/com/ubuntu/content/detail/transfer.cpp (+3/-0)
To merge this branch: bzr merge lp:~michael-sheldon/content-hub/set-download-appid
Reviewer Review Type Date Requested Status
Ken VanDine Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+272104@code.launchpad.net

Commit message

Set destination app-id as download metadata

Description of the change

Set destination app-id as download metadata

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:250
http://jenkins.qa.ubuntu.com/job/content-hub-ci/288/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/70
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/70
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/70/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/70

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/288/rebuild

review: Approve (continuous-integration)
lp:~michael-sheldon/content-hub/set-download-appid updated
251. By Michael Sheldon

Merge from trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:251
http://jenkins.qa.ubuntu.com/job/content-hub-ci/289/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/71
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/71/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/71

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/289/rebuild

review: Approve (continuous-integration)
lp:~michael-sheldon/content-hub/set-download-appid updated
252. By Michael Sheldon

Add build dependency on qtdeclarative5-ubuntu-ui-toolkit-plugin

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:252
http://jenkins.qa.ubuntu.com/job/content-hub-ci/326/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/108
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/108/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/108

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/326/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2015-09-23 14:45:09 +0000
+++ debian/control 2015-12-08 15:33:38 +0000
@@ -24,6 +24,7 @@
24 qtdeclarative5-dev-tools,24 qtdeclarative5-dev-tools,
25 qtdeclarative5-qtquick2-plugin,25 qtdeclarative5-qtquick2-plugin,
26 qtdeclarative5-test-plugin,26 qtdeclarative5-test-plugin,
27 qtdeclarative5-ubuntu-ui-toolkit-plugin,
27Standards-Version: 3.9.428Standards-Version: 3.9.4
28Section: libs29Section: libs
29Homepage: https://launchpad.net/content-hub30Homepage: https://launchpad.net/content-hub
3031
=== modified file 'src/com/ubuntu/content/detail/transfer.cpp'
--- src/com/ubuntu/content/detail/transfer.cpp 2015-10-28 17:14:10 +0000
+++ src/com/ubuntu/content/detail/transfer.cpp 2015-12-08 15:33:38 +0000
@@ -237,6 +237,9 @@
237 download->setDestinationDir(d->store);237 download->setDestinationDir(d->store);
238 connect(download, SIGNAL(finished(QString)), this, SLOT(DownloadComplete(QString)));238 connect(download, SIGNAL(finished(QString)), this, SLOT(DownloadComplete(QString)));
239 connect(download, SIGNAL(error(Ubuntu::DownloadManager::Error*)), this, SLOT(DownloadError(Ubuntu::DownloadManager::Error*)));239 connect(download, SIGNAL(error(Ubuntu::DownloadManager::Error*)), this, SLOT(DownloadError(Ubuntu::DownloadManager::Error*)));
240 QVariantMap metadata = download->metadata();
241 metadata["app-id"] = d->destination;
242 download->setMetadata(metadata);
240 download->start();243 download->start();
241 d->state = cuc::Transfer::downloading;244 d->state = cuc::Transfer::downloading;
242 Q_EMIT(StateChanged(d->state));245 Q_EMIT(StateChanged(d->state));

Subscribers

People subscribed via source and target branches