From 8fcff874485b5bea751a329e39aa046557d56c96 Mon Sep 17 00:00:00 2001 From: Bernd Wachter Date: Sat, 21 Sep 2013 01:05:26 +0300 Subject: [PATCH] [ssuks] Append flavour for rnd images to avoid cache conflicts --- ssuks/ssukickstarter.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ssuks/ssukickstarter.cpp b/ssuks/ssukickstarter.cpp index 147f615..c678925 100644 --- a/ssuks/ssukickstarter.cpp +++ b/ssuks/ssukickstarter.cpp @@ -107,19 +107,23 @@ QStringList SsuKickstarter::repos(){ // Adaptation repos need to have separate naming so that when images are done // the repository caches will not be mixed with each other. 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(replaceSpaces(deviceModel)) .arg((rndMode ? repoOverride.value("rndRelease") : repoOverride.value("release"))) + .arg((rndMode ? "-" + repoOverride.value("flavourName") + : "")) .arg(repoUrl) ); } else - result.append(QString("repo --name=%1-%2 --baseurl=%3") + result.append(QString("repo --name=%1-%2%3 --baseurl=%4") .arg(repo) .arg((rndMode ? repoOverride.value("rndRelease") : repoOverride.value("release"))) + .arg((rndMode ? "-" + repoOverride.value("flavourName") + : "")) .arg(repoUrl) ); }