Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
End group when reading complete section in deviceinfo
  • Loading branch information
Bernd Wachter committed Apr 5, 2013
1 parent 8298403 commit 6a9c80c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
1 change: 1 addition & 0 deletions libssu/ssudeviceinfo.cpp
Expand Up @@ -293,6 +293,7 @@ void SsuDeviceInfo::variableSection(QString section, QHash<QString, QString> *st
foreach (const QString &key, keys){
storageHash->insert(key, boardMappings->value(key).toString());
}
boardMappings->endGroup();
}

void SsuDeviceInfo::setDeviceModel(QString model){
Expand Down
19 changes: 13 additions & 6 deletions ssuks/ssuks.cpp
Expand Up @@ -43,19 +43,26 @@ void SsuKs::run(){
}


Sandbox *sb;
if (repoParameters.contains("sandbox")){
QString sandbox = repoParameters.value("sandbox");
repoParameters.remove("sandbox");

qout << "Using sandbox at " << sandbox << endl;
Sandbox *sb = new Sandbox(sandbox, Sandbox::UseAsSkeleton, Sandbox::ThisProcess);
sb = new Sandbox(sandbox, Sandbox::UseAsSkeleton, Sandbox::ThisProcess);
sb->addWorldFiles(SSU_BOARD_MAPPING_CONFIGURATION_DIR);
sb->activate();
sb->addWorldFiles("/etc/ssu");
sb->addWorldFiles("/usr/share/ssu");
if (sb->activate())
qout << "Using sandbox at " << sandbox << endl;
else {
qout << "Failed to activate sandbox" << endl;
return;
}
}

SsuKickstarter kickstarter;
kickstarter.setRepoParameters(repoParameters);
kickstarter.write(fileName);
SsuKickstarter *kickstarter = new SsuKickstarter();
kickstarter->setRepoParameters(repoParameters);
kickstarter->write(fileName);
} else
usage();

Expand Down

0 comments on commit 6a9c80c

Please sign in to comment.