summaryrefslogtreecommitdiffstats
path: root/installerbuilder/libinstaller/qinstallercomponent.cpp
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@nokia.com>2011-03-15 19:48:38 +0100
committerTim Jenssen <tim.jenssen@nokia.com>2011-03-15 19:48:38 +0100
commit3103ea4193034a2598a1a24efe782a60534a9abc (patch)
treec0d9d75222905706a9ed9d63e5dadc46cd861fc7 /installerbuilder/libinstaller/qinstallercomponent.cpp
parentabbee7b0ec2e1fbc676b31949320b35a4c6620c7 (diff)
added possibility to start an installer without force installations - for better testing
Diffstat (limited to 'installerbuilder/libinstaller/qinstallercomponent.cpp')
-rw-r--r--installerbuilder/libinstaller/qinstallercomponent.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/installerbuilder/libinstaller/qinstallercomponent.cpp b/installerbuilder/libinstaller/qinstallercomponent.cpp
index eb6919035..6ebdd1e89 100644
--- a/installerbuilder/libinstaller/qinstallercomponent.cpp
+++ b/installerbuilder/libinstaller/qinstallercomponent.cpp
@@ -252,7 +252,7 @@ void Component::loadDataFromPackageInfo(const KDUpdater::PackageInfo &packageInf
setValue(QLatin1String("Dependencies"), dependstr);
if (packageInfo.forcedInstallation)
setValue(QLatin1String("ForcedInstallation"),
- packageInfo.forcedInstallation ? QLatin1String ("true") : QLatin1String ("false"));
+ packageInfo.forcedInstallation ? QLatin1String ("true") : QLatin1String ("false"));
}
//update means it is the packageinfo from server
@@ -287,8 +287,13 @@ void Component::loadDataFromUpdate(KDUpdater::Update* update)
update->data(QLatin1String("AutoSelectOn")).toString());
setValue(QLatin1String("Important"),
update->data(QLatin1String("Important")).toString());
- setValue(QLatin1String("ForcedInstallation"),
- update->data(QLatin1String("ForcedInstallation")).toString());
+
+ if (qApp->arguments().contains(QLatin1String("--no-force-installations")))
+ setValue(QLatin1String("ForcedInstallation"), QLatin1String("false"));
+ else
+ setValue(QLatin1String("ForcedInstallation"),
+ update->data(QLatin1String("ForcedInstallation")).toString());
+
setValue(QLatin1String("UpdateText"),
update->data(QLatin1String("UpdateText")).toString());
setValue(QLatin1String("RequiresAdminRights"),