zebreus/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests 1 Activity

Settings: Add bool get()

Browse source
This commit is contained in:
Eelco Dolstra 2014-09-17 15:18:13 +02:00
parent eca29bd72d
commit d37d012774
4 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/download-via-ssh/download-via-ssh.cc
View file

@ -108,7 +108,7 @@ int main(int argc, char * * argv)
/* Pass on the location of the daemon client's SSH /* Pass on the location of the daemon client's SSH
authentication socket. */ authentication socket. */
string sshAuthSock = settings.get("ssh-auth-sock", ""); string sshAuthSock = settings.get("ssh-auth-sock", string(""));
if (sshAuthSock != "") setenv("SSH_AUTH_SOCK", sshAuthSock.c_str(), 1); if (sshAuthSock != "") setenv("SSH_AUTH_SOCK", sshAuthSock.c_str(), 1);
string host = settings.sshSubstituterHosts.front(); string host = settings.sshSubstituterHosts.front();

4
src/libstore/build.cc
View file

@ -1792,8 +1792,8 @@ void DerivationGoal::startBuilder()
/* Bind-mount a user-configurable set of directories from the /* Bind-mount a user-configurable set of directories from the
host file system. */ host file system. */
PathSet dirs = tokenizeString<StringSet>(settings.get("build-chroot-dirs", DEFAULT_CHROOT_DIRS)); PathSet dirs = tokenizeString<StringSet>(settings.get("build-chroot-dirs", string(DEFAULT_CHROOT_DIRS)));
PathSet dirs2 = tokenizeString<StringSet>(settings.get("build-extra-chroot-dirs", "")); PathSet dirs2 = tokenizeString<StringSet>(settings.get("build-extra-chroot-dirs", string("")));
dirs.insert(dirs2.begin(), dirs2.end()); dirs.insert(dirs2.begin(), dirs2.end());
for (auto & i : dirs) { for (auto & i : dirs) {
size_t p = i.find('='); size_t p = i.find('=');

8
src/libstore/globals.cc
View file

@ -136,6 +136,14 @@ Strings Settings::get(const string & name, const Strings & def)
} }
bool Settings::get(const string & name, bool def)
{
bool res = def;
_get(res, name);
return res;
}
void Settings::update() void Settings::update()
{ {
_get(tryFallback, "build-fallback"); _get(tryFallback, "build-fallback");

2
src/libstore/globals.hh
View file

@ -25,6 +25,8 @@ struct Settings {
Strings get(const string & name, const Strings & def); Strings get(const string & name, const Strings & def);
bool get(const string & name, bool def);
void update(); void update();
string pack(); string pack();