summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@nokia.com>2011-11-25 14:27:55 +0100
committerKarsten Heimrich <karsten.heimrich@nokia.com>2011-11-28 13:15:03 +0100
commit995ea7db1801925d63e94d3c196bd60d5b40134b (patch)
treeb200f5403663f95ef4cd4cfdac69b9bc39740b37
parent3c4d0b9ce73a0d0bb0d04b6d2fd707138abc4c67 (diff)
Fix a problem that isOfflineOnly returned true.
This happend even in updater/ package manager mode when the original install was done using an offline installer. This can only be true if we are an installer. Change-Id: I345453dfc870b9945295371f5d6f8cb4a0057a50 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
-rw-r--r--installerbuilder/libinstaller/packagemanagercore.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/installerbuilder/libinstaller/packagemanagercore.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp
index 476d34650..88c5becab 100644
--- a/installerbuilder/libinstaller/packagemanagercore.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore.cpp
@@ -1321,8 +1321,11 @@ bool PackageManagerCore::isInstaller() const
*/
bool PackageManagerCore::isOfflineOnly() const
{
+ if (!d->isInstaller())
+ return false;
+
QSettingsWrapper confInternal(QLatin1String(":/config/config-internal.ini"), QSettingsWrapper::IniFormat);
- return confInternal.value(QLatin1String("offlineOnly")).toBool();
+ return confInternal.value(QLatin1String("offlineOnly"), false).toBool();
}
void PackageManagerCore::setUninstaller()