summaryrefslogtreecommitdiffstats
path: root/installerbuilder/common
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@nokia.com>2011-10-21 13:13:33 +0200
committerTim Jenssen <tim.jenssen@nokia.com>2011-10-21 13:32:15 +0200
commit432fe386bf9d9ab75b912671c567fd5b7cbbac44 (patch)
tree6ecb7bbdf1fb50a5f19f039b46dd8a3aa2f3448c /installerbuilder/common
parentef4bb0a9c4da5453c7330e37767eebf702d9d12a (diff)
the collected items need to depend on the addDependencies boolean
Change-Id: I3b4ea4c090efd42bcc5de21a9a9340e72856f848 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Diffstat (limited to 'installerbuilder/common')
-rw-r--r--installerbuilder/common/repositorygen.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/installerbuilder/common/repositorygen.cpp b/installerbuilder/common/repositorygen.cpp
index 60e142706..d281e267b 100644
--- a/installerbuilder/common/repositorygen.cpp
+++ b/installerbuilder/common/repositorygen.cpp
@@ -593,6 +593,14 @@ QVector<PackageInfo> QInstaller::createListOfPackages(const QStringList& compone
const QString& packagesDirectory, bool addDependencies)
{
const QVector< PackageInfo > availablePackageInfos = collectAvailablePackages(packagesDirectory);
+ if (!addDependencies) {
+ QVector<PackageInfo> packageInfos;
+ foreach (const PackageInfo info, availablePackageInfos) {
+ if (components.contains(info.name))
+ packageInfos.append(info);
+ }
+ return packageInfos;
+ }
return availablePackageInfos;
//we don't want to have two different dependency checking codes (installer itself and repgen here)