From 3a7e008cd4703f8721dab6f0853c3c470cd7a17b Mon Sep 17 00:00:00 2001 From: Bernd Wachter Date: Sat, 27 Apr 2013 12:16:48 +0300 Subject: [PATCH] [ssu] Allow domain override, useful for something like ssuks model=foo domain=public --- .gitignore | 1 + libssu/ssurepomanager.cpp | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cdde22c..790a982 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ doc/html doc/latex *.pro.user *.list +/tests/testutils/Makefile.sandboxhook diff --git a/libssu/ssurepomanager.cpp b/libssu/ssurepomanager.cpp index 5c83a23..c103ef9 100644 --- a/libssu/ssurepomanager.cpp +++ b/libssu/ssurepomanager.cpp @@ -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::const_iterator i = parametersOverride.constBegin();