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

[Michael Sheldon]

Clean up processed files even when processing fails

Clean up processed files even when processing fails

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:348
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/796/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-wily-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-wily-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-wily-armhf-ci/26/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/796/rebuild

review: Approve (continuous-integration)

=== modified file 'src/downloads/priv/ubuntu/downloads/file_download.cpp'
--- src/downloads/priv/ubuntu/downloads/file_download.cpp	2015-12-23 13:28:57 +0000
+++ src/downloads/priv/ubuntu/downloads/file_download.cpp	2016-02-10 14:56:35 +0000
@@ -769,22 +769,23 @@
 FileDownload::onProcessFinished(int exitCode, QProcess::ExitStatus exitStatus) {
     TRACE << exitCode << exitStatus;
     auto p = qobject_cast<Process*>(sender());
+    // remove the file since we are done with it
+    cleanUpCurrentData();
+    // remove the file because that is the contract that we have with
+    // the clients
+    auto fileMan = FileManager::instance();
+
+    if (fileMan->exists(_tempFilePath)) {
+        LOG(INFO) << "Removing '" << _tempFilePath << "'";
+        fileMan->remove(_tempFilePath);
+    }
+
+    if (fileMan->exists(_filePath)) {
+        LOG(INFO) << "Removing '" << _filePath << "'";
+        fileMan->remove(_filePath);
+    }
+
     if (exitCode == 0 && exitStatus == QProcess::NormalExit) {
-        // remove the file since we are done with it
-        cleanUpCurrentData();
-        // remove the file because that is the contract that we have with
-        // the clients
-        auto fileMan = FileManager::instance();
-
-        if (fileMan->exists(_tempFilePath)) {
-            LOG(INFO) << "Removing '" << _tempFilePath << "'";
-            fileMan->remove(_tempFilePath);
-        }
-
-        if (fileMan->exists(_filePath)) {
-            LOG(INFO) << "Removing '" << _filePath << "'";
-            fileMan->remove(_filePath);
-        }
         emitFinished();
     } else {
         auto standardOut = p->readAllStandardOutput();