Commit 35abee9c authored by Marko Saukko's avatar Marko Saukko

Make deviceFamily fallback to deviceVariant.

[ssu] Make deviceFamily fallback to deviceVariant. Contributes to JB#41312
Signed-off-by: default avatarMarko Saukko <marko.saukko@jolla.com>
parent 4dde8d22
......@@ -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;
}
......
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