Merge lp:~ken-vandine/content-hub/lp1326535 into lp:content-hub

[Ken VanDine]

Don't abort downloads that haven't been charged yet when a new transfer
is created. This will leave multiple transfers from downloads which haven't
been charged remain in active_transfers until they have been
charged. (LP: #1326535)

Having multiple downloaded transfers in active_transfers means when the
destination starts or resumes, then all the completed downloads will get charged
which will send multiple signals to the destination.

Don't abort downloads that haven't been charged yet when a new transfer
is created. This will leave multiple transfers from downloads which haven't
been charged remain in active_transfers until they have been
charged. (LP: #1326535)

Having multiple downloaded transfers in active_transfers means when the
destination starts or resumes, then all the completed downloads will get charged
which will send multiple signals to the destination.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:111
http://jenkins.qa.ubuntu.com/job/content-hub-ci/165/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/22

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed the packaging (debian), did you subscribe a core-dev to this MP?

 * No change

[Michael Sheldon (michael-sheldon)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

[Michael Sheldon (michael-sheldon)]

review: Approve

=== modified file 'src/com/ubuntu/content/detail/service.cpp'
--- src/com/ubuntu/content/detail/service.cpp	2014-06-04 16:49:58 +0000
+++ src/com/ubuntu/content/detail/service.cpp	2014-06-09 20:00:34 +0000
@@ -182,6 +182,8 @@
 
     return (st != cuc::Transfer::finalized
             && st != cuc::Transfer::collected
+            && st != cuc::Transfer::downloaded
+            && st != cuc::Transfer::downloading
             && st != cuc::Transfer::aborted);
 }