summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@qt.io>2016-10-11 09:24:30 +0300
committerIikka Eklund <iikka.eklund@qt.io>2016-10-13 09:12:48 +0000
commit70d33027ad58f9e397f36745ac5b7b476fa9e1dc (patch)
treeda74883c03ef1260c547c2a687fa535ed34c9e76
parent3a986bfa3a52ddd2951fef7483c1abf87cbb83c4 (diff)
Set also display name for Repository action "remove"
We should use the display name parameter if given when using action: <Repository action="remove" url="http://foo.bar" displayname="foobar"/> I.e. when the repository gets removed it should print out the given displayname. Now it always prints the url. Change-Id: I227c02c45c21be3c7c93d57f4242e1fc5c189f3c Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
-rw-r--r--src/libs/installer/metadatajob.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp
index 77a04104c..aad387232 100644
--- a/src/libs/installer/metadatajob.cpp
+++ b/src/libs/installer/metadatajob.cpp
@@ -390,6 +390,7 @@ MetadataJob::Status MetadataJob::parseUpdatesXml(const QList<FileTaskResult> &re
} else if (action == QLatin1String("remove")) {
// remove possible default repositories using the given server url
Repository repository(el.attribute(QLatin1String("url")), true);
+ repository.setDisplayName(el.attribute(QLatin1String("displayname")));
repositoryUpdates.insertMulti(action, qMakePair(repository, Repository()));
qDebug() << "Repository to remove:" << repository.displayname();