From afae7d174c6958e328f5f7166b0e5a629e7eaaba Mon Sep 17 00:00:00 2001 From: Pekka Lundstrom Date: Tue, 29 Jan 2013 14:15:24 +0200 Subject: [PATCH] [ssu] changed domain handling logic to always include default-domain. Contributes to JB#4495 --- libssu/ssu.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/libssu/ssu.cpp b/libssu/ssu.cpp index 52cd985..2059de2 100644 --- a/libssu/ssu.cpp +++ b/libssu/ssu.cpp @@ -370,17 +370,24 @@ QString Ssu::repoUrl(QString repoName, bool rndRepo, QHash rep repoParameters.insert("deviceModel", deviceModel()); // Domain variables + // first read all variables from default-domain + repoSettings->beginGroup("default-domain"); + QStringList defKeys = repoSettings->allKeys(); + foreach (const QString &key, defKeys){ + repoParameters.insert(key, repoSettings->value(key).toString()); + } + repoSettings->endGroup(); + // then overwrite with domain specific things if that block is available QString domainSection = domain() + "-domain"; QStringList sections = repoSettings->childGroups(); - if (sections.contains(domainSection)) + if (sections.contains(domainSection)){ repoSettings->beginGroup(domainSection); - else - repoSettings->beginGroup("default-domain"); - QStringList domainKeys = repoSettings->allKeys(); - foreach (const QString &key, domainKeys){ + QStringList domainKeys = repoSettings->allKeys(); + foreach (const QString &key, domainKeys){ repoParameters.insert(key, repoSettings->value(key).toString()); + } + repoSettings->endGroup(); } - repoSettings->endGroup(); if (settings->contains("repository-urls/" + repoName)) r = settings->value("repository-urls/" + repoName).toString();