Skip to content

Commit

Permalink
[ssu] Allow domain override, useful for something like ssuks model=fo…
Browse files Browse the repository at this point in the history
…o domain=public
  • Loading branch information
Bernd Wachter committed Apr 27, 2013
1 parent 2045fb3 commit 3a7e008
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -4,3 +4,4 @@ doc/html
doc/latex
*.pro.user
*.list
/tests/testutils/Makefile.sandboxhook
9 changes: 7 additions & 2 deletions libssu/ssurepomanager.cpp
Expand Up @@ -265,8 +265,13 @@ QString SsuRepoManager::url(QString repoName, bool rndRepo,
// first read all variables from default-domain
var.resolveSection(&repoSettings, "default-domain", &repoParameters);

// then overwrite with domain specific things if that block is available
var.resolveSection(&repoSettings, settings->domain()+"-domain", &repoParameters);
// then overwrite with domain specific things if that block is available,
// taking into account override parameters
if (parametersOverride.contains("domain"))
var.resolveSection(&repoSettings,
parametersOverride.value("domain")+"-domain", &repoParameters);
else
var.resolveSection(&repoSettings, settings->domain()+"-domain", &repoParameters);

// override arbitrary variables, mostly useful for generating mic URLs
QHash<QString, QString>::const_iterator i = parametersOverride.constBegin();
Expand Down

0 comments on commit 3a7e008

Please sign in to comment.