From ef4bb0a9c4da5453c7330e37767eebf702d9d12a Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Fri, 21 Oct 2011 13:13:13 +0200 Subject: rename available in availablePackageInfos Change-Id: Id6da56b94d7992166dff36e1664b293fcb072962 Reviewed-by: Karsten Heimrich --- installerbuilder/common/repositorygen.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'installerbuilder/common') 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 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 needed = calculateNeededPackages(components, available, addDependencies); + QVector 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 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; -- cgit v1.2.3