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

[Ken VanDine]

Fall back to a copy if move fails

Fall back to a copy if move fails

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/195/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?

 * NA

If you changed UI labels, did you update the pot file?

 * NA

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

 * NA

[Andrew Hayzen (ahayzen)]

This fixes the issue of move() not working for the music-app while under confinement thanks :)

review: Approve

[lp:~ken-vandine/content-hub/lp1373086]

142. By Ken VanDine on 2014-10-08

merged trunk

[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

review: Approve

=== modified file 'import/Ubuntu/Content/contentitem.cpp'
--- import/Ubuntu/Content/contentitem.cpp	2014-07-14 12:32:27 +0000
+++ import/Ubuntu/Content/contentitem.cpp	2014-10-08 15:46:59 +0000
@@ -205,8 +205,11 @@
     TRACE() << Q_FUNC_INFO << "New path:" << destFilePath;
 
     if (not QFile::rename(fi.absoluteFilePath(), destFilePath)) {
-        qWarning() << "Failed to move content to:" << destFilePath;
-        return false;
+        qWarning() << "Failed to move content to:" << destFilePath << "falling back to copy";
+        if (not QFile::copy(fi.absoluteFilePath(), destFilePath)) {
+            qWarning() << "Failed to copy content to:" << destFilePath;
+            return false;
+        }
     }
 
     setUrl(QUrl::fromLocalFile(destFilePath));