Commit 3a7e008c authored by Aard's avatar Aard

[ssu] Allow domain override, useful for something like ssuks model=foo domain=public

parent 2045fb3a
......@@ -4,3 +4,4 @@ doc/html
doc/latex
*.pro.user
*.list
/tests/testutils/Makefile.sandboxhook
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment