From 554bb7d9ceb1c6c426c8f1f4d5fe6685d583d482 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 25 Sep 2019 17:25:07 +0200
Subject: [PATCH] hydra-queue-runner: Don't pass IN_SYSTEMD to child processes

This caused local builds to have journal priority prefixes
(e.g. '<3>').
---
 src/hydra-queue-runner/hydra-queue-runner.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/hydra-queue-runner/hydra-queue-runner.cc b/src/hydra-queue-runner/hydra-queue-runner.cc
index acc838c7..fa7515d3 100644
--- a/src/hydra-queue-runner/hydra-queue-runner.cc
+++ b/src/hydra-queue-runner/hydra-queue-runner.cc
@@ -862,6 +862,9 @@ int main(int argc, char * * argv)
         signal(SIGTERM, SIG_DFL);
         signal(SIGHUP, SIG_DFL);
 
+        // FIXME: do this in the child environment in openConnection().
+        unsetenv("IN_SYSTEMD");
+
         bool unlock = false;
         bool status = false;
         BuildID buildOne = 0;