diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-02-24 17:58:43 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-02-24 17:58:43 +0000 |
commit | 7d703f2106faa3c879d0ec066a474e10981d8e56 (patch) | |
tree | b7c02d3d69c52022e5a7e0f8f6815f5ec1ddd81a /src/build-remote | |
parent | b0d52855dc57a217c0003fd3aa6cb49fd8ecb2d7 (diff) | |
parent | 199081ad00e6ee4c704eaac34211b454fe0f310c (diff) |
Merge remote-tracking branch 'upstream/master' into trustless-remote-builder-simple
Diffstat (limited to 'src/build-remote')
-rw-r--r-- | src/build-remote/build-remote.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc index dab493d67..3bd16e2fb 100644 --- a/src/build-remote/build-remote.cc +++ b/src/build-remote/build-remote.cc @@ -53,6 +53,9 @@ static int main_build_remote(int argc, char * * argv) unsetenv("DISPLAY"); unsetenv("SSH_ASKPASS"); + /* If we ever use the common args framework, make sure to + remove initPlugins below and initialize settings first. + */ if (argc != 2) throw UsageError("called without required arguments"); |