Commit 236af598 authored by sage's avatar sage

Merge branch 'jb41312' into 'master'


See merge request !18
parents 2bd0af0d 35abee9c
......@@ -136,10 +136,15 @@ QString SsuDeviceInfo::deviceFamily()
QString model = deviceVariant(true);
cachedFamily = "UNKNOWN";
if (boardMappings->contains(model + "/family"))
if (boardMappings->contains(model + "/family")) {
cachedFamily = boardMappings->value(model + "/family").toString();
} else {
// In case family is not defined, lets use device variant, which
// falls back to device model. This way we can use the deviceFamily
// in common repository names where we want to have same feature package
// for multiple devices some of which have family and some which do not.
cachedFamily = model;
return cachedFamily;
......@@ -407,6 +407,7 @@ QString SsuRepoManager::url(const QString &repoName, bool rndRepo,
repoParameters.insert("deviceFamily", deviceInfo.deviceFamily());
repoParameters.insert("deviceModel", deviceInfo.deviceModel());
repoParameters.insert("deviceVariant", deviceInfo.deviceVariant(true));
QString adaptationRepoName = deviceInfo.adaptationVariables(repoName, &repoParameters);
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