From 038425215cbec788ad5733b9d63bdfc21a8a4c47 Mon Sep 17 00:00:00 2001 From: AlmAck Date: Tue, 19 Jan 2016 23:26:13 +0100 Subject: [PATCH] Implemented the summary list of replaced packages. To be improved. --- queueoperation.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/queueoperation.cpp b/queueoperation.cpp index f6c6f7f..5c07e7a 100644 --- a/queueoperation.cpp +++ b/queueoperation.cpp @@ -308,11 +308,14 @@ void QueueOperation::validationFinished(bool valid) } if (!m_transaction->toBeReplaced().isEmpty()) { out << QObject::tr("The following packages are going to be replaced: "); - foreach (Akabei::Package* old, m_transaction->toBeReplaced().keys()) { - if (old != *(m_transaction->toBeReplaced().keys().begin())) + foreach (Akabei::Package* pkg, m_transaction->toBeReplaced().keys()) { + QList older = m_transaction->toBeReplaced().value(pkg); + out << pkg->name() << " -> ("; + foreach(Akabei::Package* replaced, older){ + out << replaced->name(); out << QObject::tr(", "); - Akabei::Package* newer = m_transaction->toBeReplaced().value(old); - out << old->name() << " (" << old->version().toByteArray() << " -> " << newer->version().toByteArray() << ")"; + } + out << ")"; } out << endl; } -- GitLab