Merge branch 'master' into deploy.spirit
authorMark Wooding <mdw@distorted.org.uk>
Sun, 19 Apr 2020 17:51:46 +0000 (18:51 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sun, 19 Apr 2020 17:51:46 +0000 (18:51 +0100)
commitfecf9644a3c004b3ea3aa9be085882341f0a11d2
tree78dd9eb3f5e33b51584877395ab71a6cb1184afb
parentcf54e319c5ac7f43869b517970e18c509578a879
parent4ff3ebbb8005414d72b2abd884f641c60917b725
Merge branch 'master' into deploy.spirit

* master:
  src/jobclient.c: Cope if the jobserver pipe is set nonblocking.
  bin/chroot-maint: Force `--no-merged-usr'.
  bin/chroot-maint: Update the path correctly when following a symlink.
  bin/chroot-maint: Don't forget to copy symlinks to directories.