diff options
author | Ludovic Courtès <ludo@gnu.org> | 2021-04-06 12:10:29 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2021-04-09 17:46:38 +0200 |
commit | 2d73086262e1fb33cd0f0f16f74a495fe06b38aa (patch) | |
tree | 4811dc7447842b834517ac1bf42127f897197428 /.guix-channel | |
parent | ccff3380867b588f0c68e9daedd5728392a91a3f (diff) | |
download | guix-2d73086262e1fb33cd0f0f16f74a495fe06b38aa.tar.gz |
daemon: 'guix substitute' replies on FD 4.
This avoids the situation where error messages would unintentionally go to stderr and be wrongfully interpreted as a reply by the daemon. Fixes <https://bugs.gnu.org/46362>. This is a followup to ee3226e9d54891c7e696912245e4904435be191c. * guix/scripts/substitute.scm (display-narinfo-data): Add 'port' parameter and honor it. (process-query): Likewise. (process-substitution): Likewise. (%error-to-file-descriptor-4?, with-redirected-error-port): Remove. (%reply-file-descriptor): New variable. (guix-substitute): Remove use of 'with-redirected-error-port'. Define 'reply-port' and pass it to 'process-query' and 'process-substitution'. * nix/libstore/build.cc (SubstitutionGoal::handleChildOutput): Swap 'builderOut' and 'fromAgent'. * nix/libstore/local-store.cc (LocalStore::getLineFromSubstituter): Likewise. * tests/substitute.scm <top level>: Set '%reply-file-descriptor' rather than '%error-to-file-descriptor-4?'.
Diffstat (limited to '.guix-channel')
0 files changed, 0 insertions, 0 deletions