Merge lp:~michael-sheldon/gallery-app/finalize-transfers into lp:gallery-app

[Michael Sheldon]

Finalize content-hub transfers so that temporary files in ~/.cache can be cleaned up by content-hub.

Finalize content-hub transfers so that temporary files in ~/.cache can be cleaned up by content-hub.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1011
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/889/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/64
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/64/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1384
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/304
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/227
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1551
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1551/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/889/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

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

 * Yes, requires: https://code.launchpad.net/~michael-sheldon/content-hub/fix-export-finalization/+merge/225831

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/gallery-app) 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 add a core-dev as a reviewer to this MP?

 * No change

[Ken VanDine (ken-vandine)]

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

review: Approve

[lp:~michael-sheldon/gallery-app/finalize-transfers]

1012. By Michael Sheldon on 2014-07-21

Merge from trunk

[Arthur Mello (artmello)]

Already merged on gallery-app

=== modified file 'src/content-communicator.cpp'
--- src/content-communicator.cpp	2014-07-03 16:09:27 +0000
+++ src/content-communicator.cpp	2014-07-21 13:07:15 +0000
@@ -86,6 +86,9 @@
         }
         QFile::copy(hubItem.url().toLocalFile(), destination);
     }
+    // Allow content-hub to clean up temporary files in .cache/ once we've
+    // moved them
+    transfer->finalize();
 }
 
 /*!