Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Suggest developer-mode to rnd images by default.
[ks] Suggest developer-mode to rnd images by default. Contributes to JB#39097

Other option would have been to create separate img-features-rnd= for
the rnd side, however that seems a bit overkill as in general the
features should be the same on release and rnd to make sure that we have
same functionality. The installation of developermode to the rnd images
is quite special case.

Signed-off-by: Marko Saukko <marko.saukko@jolla.com>
  • Loading branch information
saukko committed Sep 30, 2017
1 parent 1b8d1e8 commit 3b54e04
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions ssuks/ssukickstarter.cpp
Expand Up @@ -347,15 +347,19 @@ bool SsuKickstarter::write(const QString &kickstart)

QStringList featuresList = deviceInfo.value("img-features").toStringList();

// Add developer-mode feature to rnd images by default
if (rndMode)
featuresList << "developer-mode";

QString suggestedFeatures;

// work around some idiotic JS list parsing on our side by terminating one-element list by comma
if (featuresList.count() == 1)
suggestedFeatures = QString("# SuggestedFeatures: %1,")
.arg(deviceInfo.value("img-features").toStringList().join(", "));
.arg(featuresList.join(", "));
else if (featuresList.count() > 1)
suggestedFeatures = QString("# SuggestedFeatures: %1")
.arg(deviceInfo.value("img-features").toStringList().join(", "));
.arg(featuresList.join(", "));

QString imageType = "fs";
if (!deviceInfo.value("img-type").toString().isEmpty())
Expand Down

0 comments on commit 3b54e04

Please sign in to comment.