Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'omp-jb46786' into 'master'
[ssuks] Respect the "domain" setting in repo parameters. Contributes to JB#46786

See merge request mer-core/ssu!32
  • Loading branch information
Andrew Branson committed Aug 26, 2019
2 parents 7849b47 + b02a6b9 commit 0faf6c1
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions ssuks/ssukickstarter.cpp
Expand Up @@ -244,9 +244,12 @@ bool SsuKickstarter::write(const QString &kickstart)
rndMode = false;
}

if (repoOverride.contains("domain")) {
ssu.setDomain(repoOverride.value("domain"));
}

QHash<QString, QString> defaults;
// get generic repo variables; domain and adaptation specific bits are not interesting
// in the kickstart
// get generic repo variables; adaptation specific bits are not interesting in the kickstart
SsuRepoManager repoManager;
repoManager.repoVariables(&defaults, rndMode);

Expand Down

0 comments on commit 0faf6c1

Please sign in to comment.