diff options
| author | Jarek Kobus <jaroslaw.kobus@digia.com> | 2014-09-12 09:42:52 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2014-09-25 12:56:37 +0200 |
| commit | d1c81741d514c0f61271ae8d2ac4ce8b94a5302e (patch) | |
| tree | 98b74ff16143204ff7b7eedd8810c75770a0e61e /src | |
| parent | 799d6362117696af748cd4dd031611b76289ebba (diff) | |
Add one common message for recursion error
Change-Id: I82a75bab25e6d0a691f1e3415cccfe43e8145d89
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 12 | ||||
| -rw-r--r-- | src/libs/installer/packagemanagercore_p.h | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index cea9c2b07..61e02412b 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -245,6 +245,12 @@ void InstallerCalculator::realAppendToInstallComponents(Component *component) } } +QString InstallerCalculator::recursionError(Component *component) +{ + return QString::fromLatin1("Recursion detected component (%1) already added with " + "reason: \"%2\"").arg(component->name(), installReason(component)); +} + bool InstallerCalculator::appendComponentsToInstall(const QList<Component *> &components) { if (components.isEmpty()) { @@ -255,8 +261,7 @@ bool InstallerCalculator::appendComponentsToInstall(const QList<Component *> &co QList<Component*> notAppendedComponents; // for example components with unresolved dependencies foreach (Component *component, components){ if (m_toInstallComponentIds.contains(component->name())) { - QString errorMessage = QString::fromLatin1("Recursion detected component(%1) already added with " - "reason: \"%2\"").arg(component->name(), installReason(component)); + const QString errorMessage = recursionError(component); qDebug() << qPrintable(errorMessage); m_componentsToInstallError.append(errorMessage); Q_ASSERT_X(!m_toInstallComponentIds.contains(component->name()), Q_FUNC_INFO, @@ -320,8 +325,7 @@ bool InstallerCalculator::appendComponentToInstall(Component *component) if ((!dependencyComponent->isInstalled() || dependencyComponent->updateRequested()) && !m_toInstallComponentIds.contains(dependencyComponent->name())) { if (m_visitedComponents.value(component).contains(dependencyComponent)) { - QString errorMessage = QString::fromLatin1("Recursion detected component (%1) already " - "added with reason: \"%2\"").arg(component->name(), installReason(component)); + const QString errorMessage = recursionError(component); qDebug() << qPrintable(errorMessage); m_componentsToInstallError = errorMessage; Q_ASSERT_X(!m_visitedComponents.value(component).contains(dependencyComponent), Q_FUNC_INFO, diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h index dd99b5a7c..25d6d1fb0 100644 --- a/src/libs/installer/packagemanagercore_p.h +++ b/src/libs/installer/packagemanagercore_p.h @@ -119,6 +119,7 @@ private: const QString &referencedComponentName = QString()); void realAppendToInstallComponents(Component *component); bool appendComponentToInstall(Component *components); + QString recursionError(Component *component); PackageManagerCore *m_publicManager; PackageManagerCorePrivate *m_privateManager; |