Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb41324' into 'master'
[ssuks] Allow to inhibit implicit feature suggestions. Contribute to JB#41324

See merge request mer-core/ssu!19
  • Loading branch information
martyone committed Mar 26, 2018
2 parents 236af59 + 860a9c7 commit 6402886
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion ssuks/ssukickstarter.cpp
Expand Up @@ -345,12 +345,15 @@ bool SsuKickstarter::write(const QString &kickstart)
: "release"))
.arg(repoOverride.value("version"));

// Feature names can be prefixed with '-' to inhibit implicit suggestion
QStringList featuresList = deviceInfo.value("img-features").toStringList();

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

featuresList = featuresList.filter(QRegExp("^[^-]"));

QString suggestedFeatures;

// work around some idiotic JS list parsing on our side by terminating one-element list by comma
Expand Down

0 comments on commit 6402886

Please sign in to comment.