mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(third_party/nix): Dump of minor accumulated changes

Browse source 
None of these are worthy of a specific commit, or even have a real
reason behind them, but I didn't want to lose them.
This commit is contained in:
Vincent Ambo 2020-05-20 01:10:44 +01:00
parent ddd059e0fa
commit ffb2ae54be
5 changed files with 5 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
third_party/nix/meson.build vendored
View file

@ -107,9 +107,6 @@ config_h.set(
'SYSTEM', system, 'SYSTEM', system,
description : 'platform identifier (`cpu-os`)') description : 'platform identifier (`cpu-os`)')
# checking headers # checking headers
#============================================================================ #============================================================================

2
third_party/nix/src/build-remote/build-remote.cc vendored
View file

@ -47,7 +47,7 @@ static bool allSupportedLocally(const std::set<std::string>& requiredFeatures) {
return true; return true;
} }
static int _main(int argc, char** argv) { static int _main(int argc, char* argv[]) {
{ {
/* Ensure we don't get any SSH passphrase or host key popups. */ /* Ensure we don't get any SSH passphrase or host key popups. */
unsetenv("DISPLAY"); unsetenv("DISPLAY");

6
third_party/nix/src/libmain/shared.cc vendored
View file

@ -313,8 +313,8 @@ int handleExceptions(const string& programName, std::function<void()> fun) {
return e.status; return e.status;
} catch (UsageError& e) { } catch (UsageError& e) {
LOG(INFO) << e.what(); LOG(INFO) << e.what();
LOG(INFO) << "Try '" LOG(INFO) << "Try '" << programName << " "
<< " --help' for more information." << programName; << " --help' for more information.";
return 1; return 1;
} catch (BaseError& e) { } catch (BaseError& e) {
LOG(ERROR) << error << (settings.showTrace ? e.prefix() : "") << e.msg(); LOG(ERROR) << error << (settings.showTrace ? e.prefix() : "") << e.msg();
@ -323,7 +323,7 @@ int handleExceptions(const string& programName, std::function<void()> fun) {
} }
return e.status; return e.status;
} catch (std::bad_alloc& e) { } catch (std::bad_alloc& e) {
LOG(ERROR) << error << "out of memory"; LOG(ERROR) << error << "failed to allocate: " << e.what();
return 1; return 1;
} catch (std::exception& e) { } catch (std::exception& e) {
LOG(ERROR) << error << e.what(); LOG(ERROR) << error << e.what();

18
third_party/nix/src/libstore/meson.build vendored
View file

@ -1,12 +1,6 @@
# Nix lib store build file # Nix lib store build file
#============================================================================ #============================================================================
# src files
#============================================================================
src_inc += include_directories('.') src_inc += include_directories('.')
libstore_src = files( libstore_src = files(
@ -96,9 +90,6 @@ if sys_name.contains('freebsd')
libstore_dep_list += libdl_dep libstore_dep_list += libdl_dep
endif endif
# Link args # Link args
#============================================================================ #============================================================================
@ -107,9 +98,6 @@ libstore_link_list = [
libstore_link_args = [] libstore_link_args = []
# compiler args # compiler args
#============================================================================ #============================================================================
@ -126,9 +114,6 @@ libstore_cxx_args = [
'-DSANDBOX_SHELL="@0@" '.format(get_option('sandbox_shell')), '-DSANDBOX_SHELL="@0@" '.format(get_option('sandbox_shell')),
'-DLSOF="@0@" '.format(lsof)] '-DLSOF="@0@" '.format(lsof)]
# targets # targets
#============================================================================ #============================================================================
@ -144,9 +129,6 @@ libstore_src += custom_target(
input : 'schema.sql', input : 'schema.sql',
command : [bash, '-c', gen_header, 'sh', '@OUTPUT@']) command : [bash, '-c', gen_header, 'sh', '@OUTPUT@'])
# build # build
#============================================================================ #============================================================================

1
third_party/nix/src/nix-daemon/nix-daemon.cc vendored
View file

@ -135,6 +135,7 @@ struct TunnelLogger {
} }
void startActivity(const std::string& s) { void startActivity(const std::string& s) {
DLOG(INFO) << "startActivity(" << s << ")";
if (GET_PROTOCOL_MINOR(clientVersion) < 20) { if (GET_PROTOCOL_MINOR(clientVersion) < 20) {
if (!s.empty()) { if (!s.empty()) {
LOG(INFO) << s; LOG(INFO) << s;