summaryrefslogtreecommitdiffstats
path: root/installerbuilder/common
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@nokia.com>2011-10-21 13:13:13 +0200
committerTim Jenssen <tim.jenssen@nokia.com>2011-10-21 13:31:07 +0200
commitef4bb0a9c4da5453c7330e37767eebf702d9d12a (patch)
treeec258e9b56b315c3f47355beabfc408841466b11 /installerbuilder/common
parent22487b69009d9529e269e47bed76ce769f017da8 (diff)
rename available in availablePackageInfos
Change-Id: Id6da56b94d7992166dff36e1664b293fcb072962 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Diffstat (limited to 'installerbuilder/common')
-rw-r--r--installerbuilder/common/repositorygen.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/installerbuilder/common/repositorygen.cpp b/installerbuilder/common/repositorygen.cpp
index 0c9147d50..60e142706 100644
--- a/installerbuilder/common/repositorygen.cpp
+++ b/installerbuilder/common/repositorygen.cpp
@@ -592,14 +592,14 @@ void QInstaller::generateMetaDataDirectory(const QString& metapath_, const QStri
QVector<PackageInfo> QInstaller::createListOfPackages(const QStringList& components,
const QString& packagesDirectory, bool addDependencies)
{
- const QVector< PackageInfo > available = collectAvailablePackages(packagesDirectory);
- return available;
+ const QVector< PackageInfo > availablePackageInfos = collectAvailablePackages(packagesDirectory);
+ return availablePackageInfos;
//we don't want to have two different dependency checking codes (installer itself and repgen here)
//so because they have two different behaviours we deactivate it here for now
verbose() << "Calculating dependencies for selected packages..." << std::endl;
- QVector<PackageInfo> needed = calculateNeededPackages(components, available, addDependencies);
+ QVector<PackageInfo> needed = calculateNeededPackages(components, availablePackageInfos, addDependencies);
verbose() << "The following packages will be placed in the installer:" << std::endl;
Q_FOREACH (const PackageInfo& i, needed) {
@@ -620,9 +620,9 @@ QVector<PackageInfo> QInstaller::createListOfPackages(const QStringList& compone
while (!id.isEmpty()) {
PackageInfo info;
if (!version.isEmpty())
- info = findMatchingPackage(QString::fromLatin1("%1-%2").arg(id, version), available);
+ info = findMatchingPackage(QString::fromLatin1("%1-%2").arg(id, version), availablePackageInfos);
if (info.name.isEmpty())
- info = findMatchingPackage(id, available);
+ info = findMatchingPackage(id, availablePackageInfos);
if (!info.name.isEmpty() && !allPackagesHavePrefix(needed, id) && !needed.contains(info)) {
verbose() << "Adding " << info.name << " as it is the virtual parent item of "
<< name << std::endl;