Remove stupid check. Return the proper core status.

Also take into account the current status, break if it is
already Canceled or Failure. Fix fetch remote packages, as
it would set always Success, even if we already canceled.

Change-Id: I3562d485c762c6df6ff230029bc678475afd5b2c
Reviewed-on: http://codereview.qt.nokia.com/3502
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

1 files changed, 2 insertions, 8 deletions

diff --git a/installerbuilder/installerbase/tabcontroller.cpp b/installerbuilder/installerbase/tabcontroller.cpp
index 0e09adbed..10c6bd516 100644
--- a/installerbuilder/installerbase/tabcontroller.cpp
+++ b/installerbuilder/installerbase/tabcontroller.cpp
@@ -190,10 +190,7 @@ int TabController::initUpdater()
         else
             introPage->setComplete(true);
     }
-
-    if (d->m_core->status() == PackageManagerCore::Canceled)
-        return PackageManagerCore::Canceled;
-    return PackageManagerCore::Success;
+    return d->m_core->status();
 }
 
 int TabController::initUninstaller()
@@ -264,10 +261,7 @@ int TabController::initPackageManager()
 
     if (d->m_allPackagesFetched | localPackagesTreeFetched)
         introPage->setComplete(true);
-
-    if (d->m_core->status() == PackageManagerCore::Canceled)
-        return PackageManagerCore::Canceled;
-    return PackageManagerCore::Success;
+    return d->m_core->status();
 }
 
 // -- private slots