Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[ssu] changed domain handling logic to always include default-domain.…
… Contributes to JB#4495
  • Loading branch information
Pekka Lundstrom committed Jan 29, 2013
1 parent b7d8734 commit afae7d1
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions libssu/ssu.cpp
Expand Up @@ -370,17 +370,24 @@ QString Ssu::repoUrl(QString repoName, bool rndRepo, QHash<QString, QString> 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){
repoParameters.insert(key, repoSettings->value(key).toString());
}
repoSettings->endGroup();
}

if (settings->contains("repository-urls/" + repoName))
r = settings->value("repository-urls/" + repoName).toString();
Expand Down

0 comments on commit afae7d1

Please sign in to comment.