Commit 8fcff874 authored by Aard's avatar Aard

[ssuks] Append flavour for rnd images to avoid cache conflicts

parent e423d75b
...@@ -107,19 +107,23 @@ QStringList SsuKickstarter::repos(){ ...@@ -107,19 +107,23 @@ QStringList SsuKickstarter::repos(){
// Adaptation repos need to have separate naming so that when images are done // Adaptation repos need to have separate naming so that when images are done
// the repository caches will not be mixed with each other. // the repository caches will not be mixed with each other.
if (repo.startsWith("adaptation")) { if (repo.startsWith("adaptation")) {
result.append(QString("repo --name=%1-%2-%3 --baseurl=%4") result.append(QString("repo --name=%1-%2-%3%4 --baseurl=%5")
.arg(repo) .arg(repo)
.arg(replaceSpaces(deviceModel)) .arg(replaceSpaces(deviceModel))
.arg((rndMode ? repoOverride.value("rndRelease") .arg((rndMode ? repoOverride.value("rndRelease")
: repoOverride.value("release"))) : repoOverride.value("release")))
.arg((rndMode ? "-" + repoOverride.value("flavourName")
: ""))
.arg(repoUrl) .arg(repoUrl)
); );
} }
else else
result.append(QString("repo --name=%1-%2 --baseurl=%3") result.append(QString("repo --name=%1-%2%3 --baseurl=%4")
.arg(repo) .arg(repo)
.arg((rndMode ? repoOverride.value("rndRelease") .arg((rndMode ? repoOverride.value("rndRelease")
: repoOverride.value("release"))) : repoOverride.value("release")))
.arg((rndMode ? "-" + repoOverride.value("flavourName")
: ""))
.arg(repoUrl) .arg(repoUrl)
); );
} }
......
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